From 2b54f7b911ab8700ff46bf72fad6c1150743fa7f Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:35:57 +0800 Subject: t1024: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/t1024rdb-64b.conf | 10 ++++------ conf/machine/t1024rdb.conf | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf index 48681cd8..6f575adf 100644 --- a/conf/machine/t1024rdb-64b.conf +++ b/conf/machine/t1024rdb-64b.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "t1:t1024" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +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 ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb" @@ -21,7 +21,5 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf index 8f750382..cda31daf 100644 --- a/conf/machine/t1024rdb.conf +++ b/conf/machine/t1024rdb.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "t1:t1024" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +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 ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb" @@ -21,7 +21,5 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode" - USE_VT ?= "0" -- cgit v1.2.3-54-g00ecf