ls1021atwr: switch to new UBOOT_CONFIG format

Append the binary name if the final binary is not u-boot.bin.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index ce33bb6f4c42314c9882c1636c0d9f86a44aa714..457703ee6aa0b24697cb83efb0115b8d951976d8 100644 (file)
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -13,11 +13,11 @@ require conf/machine/include/tune-cortexa7.inc
 DEFAULTTUNE = "cortexa7hf-neon"
 
 UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
-UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
-UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config"
-UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config"
-UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config"
-UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config"
+UBOOT_CONFIG[nor] = "ls1021atwr_nor_config,,u-boot-dtb.bin"
+UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config,,u-boot-dtb.bin"
+UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config,,u-boot-dtb.bin"
 UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
 
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"