t104x: switch to new UBOOT_CONFIG format

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>

4 files changed, 20 insertions, 12 deletions

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index a48b7c8..5acfd23 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -8,12 +8,14 @@
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1040"
+
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"
-UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
     fsl/t1040d4rdb-dsar.dtb \
     fsl/t1040d4rdb-usdpaa-lag.dtb fsl/t1040d4rdb-usdpaa-shared-interfaces.dtb \
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 4d70030..bd6b787 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -8,12 +8,14 @@
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1040"
+
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"
-UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "fsl/t1040d4rdb.dtb fsl/t1040d4rdb-usdpaa.dtb \
     fsl/t1040d4rdb-dsar.dtb \
     fsl/t1040d4rdb-usdpaa-lag.dtb fsl/t1040d4rdb-usdpaa-shared-interfaces.dtb \
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index b7da8e2..d6194d5 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -8,12 +8,14 @@
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1042"
+
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"
-UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
     fsl/t1042d4rdb-dsar.dtb \
     fsl/t1042d4rdb-usdpaa-shared-interfaces.dtb \
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 3a2269c..5edfaa2 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -8,12 +8,14 @@
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1042"
+
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"
-UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "fsl/t1042d4rdb.dtb fsl/t1042d4rdb-usdpaa.dtb \
     fsl/t1042d4rdb-dsar.dtb \
     fsl/t1042d4rdb-usdpaa-shared-interfaces.dtb \