t1023: switch to new UBOOT_CONFIG format

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 10 insertions, 13 deletions

diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index ba6284a1..086ec767 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -9,18 +9,16 @@ require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "t1:t1023"
 
-UBOOT_CONFIG ??= "nand sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1023RDB_config"
-UBOOT_CONFIG[nand] = "T1023RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
-
+UBOOT_CONFIG[nand] = "T1023RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[secure-boot] = "T1023RDB_SECURE_BOOT_config"
 
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
-
 USE_VT ?= "0"
diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index 556a9e50..71da38a4 100644
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -9,17 +9,16 @@ require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1023"
 
-UBOOT_CONFIG ??= "nand sdcard spi nor"
+UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1023RDB_config"
-UBOOT_CONFIG[nand] = "T1023RDB_NAND_config"
-UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config"
-UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T1023RDB_NAND_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
+UBOOT_CONFIG[secure-boot] = "T1023RDB_SECURE_BOOT_config"
 
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw"
-
 USE_VT ?= "0"