Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/29448 )
Change subject: Linuxboot: remove initramfs path entry ......................................................................
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 info@marcellobauer.com Reviewed-on: https://review.coreboot.org/29448 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Philipp Deppenwiese zaolin.daisuki@gmail.com --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile 2 files changed, 3 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 8acb542..a872d49 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -129,11 +129,8 @@ 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 8376805..006fb6e 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -33,7 +33,7 @@
OBJCOPY:=$(LINUXBOOT_COMPILE)objcopy
-all: payload +all: linuxboot
toolchain: if [[ ! -x "$(LINUXBOOT_COMPILE)gcc" ]]; then \ @@ -95,7 +95,7 @@ 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