[meta-freescale] [meta-fsl-ppc][PATCH 12/13] t104x: switch to new UBOOT_CONFIG format

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/t1040d4rdb-64b.conf | 8 +++++---
 conf/machine/t1040d4rdb.conf     | 8 +++++---
 conf/machine/t1042d4rdb-64b.conf | 8 +++++---
 conf/machine/t1042d4rdb.conf     | 8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index f40dbcf..120e905 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 ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
     t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 5a0faa4..a202daa 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 ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \
     t1040d4rdb-usdpaa-lag.dtb t1040d4rdb-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 18e8b2b..c8814b5 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 ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
     t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 430cd42..3372302 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 ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \
     t1042d4rdb-usdpaa-shared-interfaces.dtb \
 "
-- 
1.9.2