[coreboot-gerrit] Change in coreboot[master]: payloads/U-Boot: Use the correct output binary

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/59601 )

Change subject: payloads/U-Boot: Use the correct output binary
......................................................................

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 
---
M payloads/external/Makefile.inc
M payloads/external/U-Boot/Kconfig
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 151a27c..a185a77 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-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 b635bbb..2ee14fd 100644
--- a/payloads/external/U-Boot/Kconfig
+++ b/payloads/external/U-Boot/Kconfig
@@ -32,7 +32,7 @@
      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"