Frans Hendriks has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/77608?usp=email )
Change subject: LinuxBoot: sync usage of LINUX_INITRAMFS_PATH ......................................................................
LinuxBoot: sync usage of LINUX_INITRAMFS_PATH
Building LinuxBoot with default options results in built error: build/initramfs_u-root.cpio.xz no such file or directory
coreboot adds LINUXBOOT_INITRAMFS_PATH to ADDITIONAL_PAYLOAD_CONFIG and prebuilt-files. The default value is ´build/initramfs_u-root.cpio´ where coreboot expects a relative path to location.
Update CONFIG_LINUXBOOT_INITRAMFS_PATH to contain absolute path to cpio file. Use this config in LinuxBoot/targets/u-root.mk to point to correct file location.
BUG = N/A TEST = Built and boot facebook monolith
Change-Id: If35cd2c2dc9307fc79311991162f7aeb1a15ae32 Signed-off-by: Frans Hendriks fhendriks@eltan.com --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/targets/u-root.mk 2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/77608/1
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 24bfe3f..c3773a9 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -131,7 +131,7 @@
config LINUXBOOT_INITRAMFS_PATH string "Path to initramfs" - default "build/initramfs_u-root.cpio" if LINUXBOOT_UROOT + default "$(top)/payloads/external/LinuxBoot/build/initramfs_u-root.cpio" if LINUXBOOT_UROOT
if LINUXBOOT_BUILD_INITRAMFS
diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index fff79df..0cc3b08 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -43,8 +43,7 @@ cd $(uroot_build); \ go build -o u-root .
-#$(CONFIG_LINUXBOOT_INITRAMFS_PATH) -build/initramfs_u-root.cpio: $(uroot_build)/u-root +$(CONFIG_LINUXBOOT_INITRAMFS_PATH): $(uroot_build)/u-root GOARCH=$(UROOT_ARCH-y) $(uroot_build)/u-root \ -uroot-source $(uroot_build) \ - $(uroot_args) -o build/initramfs_u-root.cpio $(uroot_cmds) + $(uroot_args) -o $(CONFIG_LINUXBOOT_INITRAMFS_PATH) $(uroot_cmds)