[meta-freescale] [meta-freescale-layer][PATCH 18/18] t2080: 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/t2080qds-64b.conf | 10 ++++------
 conf/machine/t2080qds.conf     | 10 ++++------
 conf/machine/t2080rdb-64b.conf | 10 ++++------
 conf/machine/t2080rdb.conf     | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 8da4582..7c03351 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"
-UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config"
-UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config"
-UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
+UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[nand] = "T2080QDS_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
@@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 825e946..230eb7b 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"
-UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config"
-UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config"
-UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
+UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[nand] = "T2080QDS_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
@@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 3a52d4b..86e1bff 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"
-UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config"
-UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
@@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 43bd557..f0b7d32 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
 
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"
-UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config"
-UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T2080RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T2080RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[nand] = "T2080RDB_NAND_config,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
@@ -23,7 +23,5 @@ KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb \
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"
-
 USE_VT ?= "0"
-- 
1.9.2