Bill XIE has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60028 )
Change subject: payloads/U-Boot: Fix various build errors ......................................................................
payloads/U-Boot: Fix various build errors
Target of U-Boot payload is inconsistent between Kconfig and Makefile.inc. Perform full clone in order to get tags. Make Kconfig prompt for revision consistent with the revision in Makefile.
Change-Id: Ic0f11c16274456a452a0422e19fab0c61d8b5d5b Signed-off-by: Bill XIE persmule@hardenedlinux.org --- M payloads/external/Makefile.inc M payloads/external/U-Boot/Kconfig M payloads/external/U-Boot/Makefile 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/60028/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index a185a77..d7258b1 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -197,7 +197,7 @@
# U-Boot
-payloads/external/U-Boot/build/u-boot/u-boot.bin u-boot: $(DOTCONFIG) +payloads/external/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG) $(MAKE) -C payloads/external/U-Boot \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) diff --git a/payloads/external/U-Boot/Kconfig b/payloads/external/U-Boot/Kconfig index 01dbc95..1cd1a0d 100644 --- a/payloads/external/U-Boot/Kconfig +++ b/payloads/external/U-Boot/Kconfig @@ -10,7 +10,7 @@ default UBOOT_STABLE
config UBOOT_STABLE - bool "v2019.4" + bool "v2021.7" help Stable U-Boot version
diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index daadb3e..f00b1f4 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -25,7 +25,7 @@
$(project_dir): echo " Cloning $(project_name) from Git" - git clone --depth 1 $(project_git_repo) $(project_dir) + git clone $(project_git_repo) $(project_dir)
fetch: $(project_dir) ifeq ($(CONFIG_UBOOT_MASTER),y)