From d6ebcf62562984ee17662dc87043a439a3426331 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Mon, 4 Jul 2016 11:13:05 +0800 Subject: t1024: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Zhenhua Luo --- conf/machine/t1024rdb-64b.conf | 8 +++++--- conf/machine/t1024rdb.conf | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf index 7bb65a8..e72564a 100644 --- a/conf/machine/t1024rdb-64b.conf +++ b/conf/machine/t1024rdb-64b.conf @@ -8,12 +8,14 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "t1:t1024" + UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1024RDB_config" -UBOOT_CONFIG[nand] = "T1024RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config" + KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb fsl/t1024rdb-usdpaa.dtb \ fsl/t1024rdb-usdpaa-shared-interfaces.dtb \ " diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf index 5466950..e44f767 100644 --- a/conf/machine/t1024rdb.conf +++ b/conf/machine/t1024rdb.conf @@ -8,12 +8,14 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "t1:t1024" + UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1024RDB_config" -UBOOT_CONFIG[nand] = "T1024RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config" + KERNEL_DEVICETREE ?= "fsl/t1024rdb.dtb fsl/t1024rdb-usdpaa.dtb \ fsl/t1024rdb-usdpaa-shared-interfaces.dtb \ " -- cgit v1.2.3-54-g00ecf