From a11bd01a284eca283691ac6c66ec9b0b4ed9f5fa Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:35:58 +0800 Subject: [PATCH] t104x: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/t1040d4rdb-64b.conf | 11 ++++------- conf/machine/t1040d4rdb.conf | 11 ++++------- conf/machine/t1042d4rdb-64b.conf | 11 ++++------- conf/machine/t1042d4rdb.conf | 11 ++++------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf index 49bf9ac7..b78c8f28 100644 --- a/conf/machine/t1040d4rdb-64b.conf +++ b/conf/machine/t1040d4rdb-64b.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "t1:t1040" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1040D4RDB_config" -UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config" KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \ @@ -22,9 +22,6 @@ KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - QE_UCODE = "iram_Type_A_T1040_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf index 5f629ed7..0896887b 100644 --- a/conf/machine/t1040d4rdb.conf +++ b/conf/machine/t1040d4rdb.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "t1:t1040" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1040D4RDB_config" -UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config" KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \ @@ -22,9 +22,6 @@ KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - QE_UCODE = "iram_Type_A_T1040_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf index fd4afb5d..961423e7 100644 --- a/conf/machine/t1042d4rdb-64b.conf +++ b/conf/machine/t1042d4rdb-64b.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "t1:t1042" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1042D4RDB_config" -UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config" KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \ @@ -22,9 +22,6 @@ KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - QE_UCODE = "iram_Type_A_T1040_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode" - USE_VT ?= "0" diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf index 5ad5cb2b..3950831a 100644 --- a/conf/machine/t1042d4rdb.conf +++ b/conf/machine/t1042d4rdb.conf @@ -9,11 +9,11 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "t1:t1042" -UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot" +UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor" UBOOT_CONFIG[nor] = "T1042D4RDB_config" -UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config" -UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config" -UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config" +UBOOT_CONFIG[nand] = "T1042D4RDB_NAND_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config,,u-boot-with-spl-pbl.bin" +UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin" UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config" KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \ @@ -22,9 +22,6 @@ KERNEL_DEVICETREE ?= "t1042d4rdb.dtb t1042d4rdb-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - QE_UCODE = "iram_Type_A_T1040_r1.0.bin" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode" - USE_VT ?= "0" -- 2.40.1