summaryrefslogtreecommitdiffstats
path: root/payloads
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-11-23 10:28:17 -0700
committerFelix Held <felix-coreboot@felixheld.de>2021-11-25 21:04:36 +0000
commited533f7077bbde1845306913d0e35d502189ae1b (patch)
tree4c89cf4b060bffe7475fb2ab2ab91e5bcd113022 /payloads
parent03f0fa182269395618d407cc6c4460d3889c7192 (diff)
downloadcoreboot-ed533f7077bbde1845306913d0e35d502189ae1b.tar.gz
coreboot-ed533f7077bbde1845306913d0e35d502189ae1b.tar.bz2
coreboot-ed533f7077bbde1845306913d0e35d502189ae1b.zip
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 <sjg@chromium.org> Change-Id: I5558ed94c7dd6cc57ceb835fe367bfa050ad2150 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59601 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/Makefile.inc2
-rw-r--r--payloads/external/U-Boot/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 151a27c010ad..a185a7772744 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 b635bbb38dd3..2ee14fdae527 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"