Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38530 )
Change subject: payloads/LinuxBoot: Fix initramfs Makefile rule ......................................................................
payloads/LinuxBoot: Fix initramfs Makefile rule
Pass $(top) to LinuxBoot Makefile and build u-root before trying to include it into uImage on aarch64.
Change-Id: I91d037a24b2893455761912fc966aa02272ad070 Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M payloads/external/LinuxBoot/Makefile M payloads/external/Makefile.inc 2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/38530/1
diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 5840e8e..67bb730 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -62,7 +62,10 @@ fi endif
-linuxboot: kernel initramfs_compressed +linuxboot: + # for AARCH64 uroot needs to be build first + $(MAKE) initramfs_compressed + $(MAKE) kernel
clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index b8af8c9..4388a9e 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -295,7 +295,8 @@ CONFIG_LINUXBOOT_UROOT_SHELL=$(CONFIG_LINUXBOOT_UROOT_SHELL) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ - CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) + CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) \ + top=$(top)
payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot payloads/external/LinuxBoot/linuxboot/uImage: linuxboot