layerscape: not set u-boot-dtb.bin in UBOOT_CONFIG

The u-boot binary name is u-boot-fit-dtb.bin if CONFIG_MULTI_DTB_FIT is
set. Below build error appears due to no u-boot-dtb.bin generated:
| cp: cannot stat '.../u-boot-dtb.bin': No such file or directory
| WARNING: exit code 1 from a shell command.

Regardless of CONFIG_OF_SEPARATE or CONFIG_MULTI_DTB_FIT being set, the
binary is copied as u-boot.bin which is used in uboot-config.bbclass by
default.

Not set u-boot-dtb.bin in UBOOT_CONFIG, just use the default u-boot.bin.

Signed-off-by: Ting Liu <ting.liu@nxp.com>

13 files changed, 27 insertions, 27 deletions

diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index 72605cc1..7de1e990 100644
--- a/conf/machine/ls1012afrwy.conf
+++ b/conf/machine/ls1012afrwy.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig"
 
 RCWQSPI ?= "N_SSNP_3305/rcw_1000"
 
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index b4bfc571..879e3f8f 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig"
 
 RCWQSPI ?= "R_SPNH_3508/rcw_1000"
 RCWQSPISEC ?= "R_SPNH_3508/rcw_1000"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index aa0f0943..e4bfb79c 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -15,12 +15,12 @@ MACHINE_FEATURES += "optee"
 DEFAULTTUNE = "cortexa7hf-neon"
 
 UBOOT_CONFIG ??= "sdcard-ifc-secure-boot sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
-UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig"
 UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_defconfig,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig"
+UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig"
+UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig"
 UBOOT_CONFIG[sdcard-ifc-secure-boot] = "ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
 
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index 7647bf41..63f3802f 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig"
+UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb"
 KERNEL_DEVICETREE_append_use-nxp-bsp = "\
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index db66cad8..fa8ab615 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1043a-rdb.dtb \
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index c22b332d..e6eabc0f 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-frwy.dtb \
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index c74f2578..97fb1e29 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-rdb.dtb \
diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf
index 1ae5693b..ecfe70ae 100644
--- a/conf/machine/ls1088ardb-pb.conf
+++ b/conf/machine/ls1088ardb-pb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 9922248f..e433b7fc 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls2080ardb.conf b/conf/machine/ls2080ardb.conf
index 859a41be..5bd4dae8 100644
--- a/conf/machine/ls2080ardb.conf
+++ b/conf/machine/ls2080ardb.conf
@@ -11,7 +11,7 @@ require conf/machine/include/qoriq-arm64.inc
 require conf/machine/include/arm/arch-arm64.inc
 
 UBOOT_CONFIG ??= "nor"
-UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[nor] = "ls2080ardb_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls2080a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index 92c99326..7f83e89d 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig"
 
 RCWNOR ?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800"
 RCWQSPI?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_2000_qspi"
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
index 5e68a9fd..e1a24f84 100644
--- a/conf/machine/lx2160ardb.conf
+++ b/conf/machine/lx2160ardb.conf
@@ -18,8 +18,8 @@ DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-lx2160a-rdb.dtb freescale/fsl-lx2160a-qds.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf
index c7ab95fb..80f91331 100644
--- a/conf/machine/lx2162aqds.conf
+++ b/conf/machine/lx2162aqds.conf
@@ -18,8 +18,8 @@ DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-verified-boot tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "lx2162aqds_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "lx2162aqds_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "lx2162aqds_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "lx2162aqds_tfa_SECURE_BOOT_defconfig"
 UBOOT_CONFIG[tfa-verified-boot] = "lx2162aqds_tfa_verified_boot_defconfig,,u-boot-nodtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-lx2162a-qds.dtb"