t2080: 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, 19 insertions, 14 deletions

diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index eddcc74..6e35e33 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -8,13 +8,15 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
+
 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"
+
 KERNEL_DEVICETREE ?= "fsl/t2080qds.dtb fsl/t2080qds-usdpaa.dtb \
     fsl/t2080qds-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index ea7fdb1..944b21b 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -8,11 +8,12 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
+
 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"
 
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index b26ef75..6f17ff7 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -8,13 +8,15 @@
 require conf/machine/include/e6500-64b.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot nor"
+
+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"
+
 KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/t2080rdb-usdpaa.dtb \
     fsl/t2080rdb-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 5882dce..05df258 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -8,11 +8,12 @@
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
+
 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"
 
@@ -22,6 +23,5 @@ KERNEL_DEVICETREE ?= "fsl/t2080rdb.dtb fsl/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"