From ed533f7077bbde1845306913d0e35d502189ae1b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 23 Nov 2021 10:28:17 -0700 Subject: payloads/U-Boot: Use the correct output binary The u-boot.bin file should be used, rather than u-boot-dtb.bin While they are often the same, the -dtb version is really just for legacy use now. Signed-off-by: Simon Glass Change-Id: I5558ed94c7dd6cc57ceb835fe367bfa050ad2150 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59601 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- payloads/external/Makefile.inc | 2 +- payloads/external/U-Boot/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 151a27c010..a185a77727 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -197,7 +197,7 @@ payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 # U-Boot -payloads/external/U-Boot/build/u-boot/u-boot-dtb.bin u-boot: $(DOTCONFIG) +payloads/external/U-Boot/build/u-boot/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 b635bbb38d..2ee14fdae5 100644 --- a/payloads/external/U-Boot/Kconfig +++ b/payloads/external/U-Boot/Kconfig @@ -32,7 +32,7 @@ config PAYLOAD_CONFIGFILE from the U-Boot config directory config PAYLOAD_FILE - default "payloads/external/U-Boot/build/u-boot/u-boot-dtb.bin" + default "payloads/external/U-Boot/build/u-boot.bin" config PAYLOAD_OPTIONS default "-l 0x1110000 -e 0x1110015" -- cgit v1.2.3