From 9d3b1b206c6b2c91e01a8a9477ac2921f728765f Mon Sep 17 00:00:00 2001 From: Marcello Sylvester Bauer Date: Sun, 4 Nov 2018 11:24:28 +0100 Subject: Linuxboot: remove initramfs path entry Remove Linuxboot initramfs path entry in Kconfig. Custom initramfs can and should be used with 'Linux payload'. Change-Id: I648fb2e0383d20b0e4d50e416af637ea07d1efb4 Signed-off-by: Marcello Sylvester Bauer Reviewed-on: https://review.coreboot.org/29448 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Deppenwiese --- payloads/external/LinuxBoot/Kconfig | 5 +---- payloads/external/LinuxBoot/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'payloads') diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 8acb542215..a872d49bf8 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -129,11 +129,8 @@ config LINUXBOOT_UROOT_FILES initramfs. config PAYLOAD_USERSPACE - string "LinuxBoot initramfs" + string default "payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz" - help - The initramfs to use with the compiled kernel. - Useful for debugging or custom initramfs. endif endif diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 83768055ef..006fb6ee5d 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -33,7 +33,7 @@ endif OBJCOPY:=$(LINUXBOOT_COMPILE)objcopy -all: payload +all: linuxboot toolchain: if [[ ! -x "$(LINUXBOOT_COMPILE)gcc" ]]; then \ @@ -95,7 +95,7 @@ $(PWD)/$(CONFIG_PAYLOAD_USERSPACE): echo "Building without u-root support" endif -payload: $(project_dir)/kernel-image $(PWD)/$(CONFIG_PAYLOAD_USERSPACE) +linuxboot: $(project_dir)/kernel-image $(PWD)/$(CONFIG_PAYLOAD_USERSPACE) clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi -- cgit v1.2.3