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>

diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index 72605cc1542538ca259f855e1e74a6abc194136d..7de1e990af8b70568bc0a60513ecb5ff44dc3c3b 100644 (file)
--- 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 b4bfc571723103ba610a57f0e876874d59408901..879e3f8fbab4f12f1c03140f726e2f0b41cd093b 100644 (file)
--- 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 aa0f0943c16393717f789230e0eb58fb1f7c151e..e4bfb79c353f2c51348061b7e4513def1cf22471 100644 (file)
--- 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 7647bf416544088562445716b06aa9fc842180c0..63f3802f79594cf65e704abae162366bd10c9535 100644 (file)
--- 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 db66cad8066d81cd64f2dc35d36939a6c15be6d7..fa8ab61566c788c0c8ee7db3291e66365378a369 100644 (file)
--- 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 c22b332dbc0b4a39ece32194c8807cba29fec00a..e6eabc0f36df88b2286a7b32aaa60ff6f5e6da7c 100644 (file)
--- 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 c74f257819bbedb61582a43b18103dce6b5127ab..97fb1e29e36ac2b19821760e03d344a42a405deb 100644 (file)
--- 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 1ae5693bb424325a67bbb275f0508585dbd00cb0..ecfe70aeef761ddf1c0ba42ba3044ba7376c45de 100644 (file)
--- 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 9922248f96ab099b62ae5281c0ebcd3cbe089ae2..e433b7fca927f540d66e4e5979aa8035a519309d 100644 (file)
--- 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 859a41be412059246974932ae5e3d37d7e9b39d4..5bd4dae8982ee2c0c08755fd24fb98f5dfa603b2 100644 (file)
--- 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 92c99326b9538838b4d8051877222976e68bca0d..7f83e89d7cb9f982823f60a76b9c1bbfc992c3f6 100644 (file)
--- 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 5e68a9fd865798b40caa6440c2b73b6228496dd4..e1a24f84d28ec61c21cd9e439974e0e79abc1ba5 100644 (file)
--- 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 c7ab95fb2e2d6e27bfeea26e61d58e5ee0a735de..80f91331b761ded40631d4c4e7858884527dc17c 100644 (file)
--- 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"