2 files changed, 8 insertions, 12 deletions
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 48681cd8a..6f575adfe 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[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
+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 8f7503825..cda31daf0 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[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
+UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
+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"

diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf index 48681cd8a..6f575adfe 100644 --- a/conf/machine/t1024rdb-64b.conf +++ b/conf/machine/t1024rdb-64b.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e5500-64b.inc
9		9
10	SOC_FAMILY = "t1:t1024"	10	SOC_FAMILY = "t1:t1024"
11		11
12	UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"	12	UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
13	UBOOT_CONFIG[nor] = "T1024RDB_config"	13	UBOOT_CONFIG[nor] = "T1024RDB_config"
14	UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"	14	UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
15	UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"	15	UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
16	UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"	16	UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
17	UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"	17	UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
18		18
19	KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"	19	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"
21		21
22	JFFS2_ERASEBLOCK = "0x10000"	22	JFFS2_ERASEBLOCK = "0x10000"
23	QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"	23	QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
24
25	EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"	24	EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
26
27	USE_VT ?= "0"	25	USE_VT ?= "0"


diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf index 8f7503825..cda31daf0 100644 --- a/conf/machine/t1024rdb.conf +++ b/conf/machine/t1024rdb.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e5500.inc
9		9
10	SOC_FAMILY = "t1:t1024"	10	SOC_FAMILY = "t1:t1024"
11		11
12	UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"	12	UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
13	UBOOT_CONFIG[nor] = "T1024RDB_config"	13	UBOOT_CONFIG[nor] = "T1024RDB_config"
14	UBOOT_CONFIG[nand] = "T1024RDB_NAND_config"	14	UBOOT_CONFIG[nand] = "T1024RDB_NAND_config,,u-boot-with-spl-pbl.bin"
15	UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"	15	UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config,,u-boot-with-spl-pbl.bin"
16	UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"	16	UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config,,u-boot-with-spl-pbl.bin"
17	UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"	17	UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
18		18
19	KERNEL_DEVICETREE ?= "t1024rdb.dtb t1024rdb-usdpaa.dtb t1024rdb-usdpaa-capwap.dtb"	19	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"
21		21
22	JFFS2_ERASEBLOCK = "0x10000"	22	JFFS2_ERASEBLOCK = "0x10000"
23	QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"	23	QE_UCODE ?= "iram_Type_A_T1024_r1.0.bin"
24
25	EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"	24	EXTRA_IMAGEDEPENDS += "fm-ucode rcw qe-ucode"
26
27	USE_VT ?= "0"	25	USE_VT ?= "0"