t1023: switch to new UBOOT_CONFIG format

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

2 files changed, 12 insertions, 8 deletions

diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index e2bbbb7..acc7e2f 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -8,11 +8,13 @@
 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 ?= "fsl/t1023rdb.dtb fsl/t1023rdb-usdpaa.dtb \
     fsl/t1023rdb-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index 91eeffe..c8b6e3c 100644
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -8,11 +8,13 @@
 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 ?= "fsl/t1023rdb.dtb fsl/t1023rdb-usdpaa.dtb \
     fsl/t1023rdb-usdpaa-shared-interfaces.dtb \
 "