[meta-freescale] [meta-freescale-layer][PATCH 09/67] conf/machine: drop UBOOT_SOURCE usage

ting.liu at nxp.com ting.liu at nxp.com
Mon Jul 4 03:41:27 PDT 2016


From: Ting Liu <ting.liu at nxp.com>

It turns out that UBOOT_SOURCE can't meet the complicated requirement
for QorIQ u-boot build.
Switch back until the new UBOOT_CONFIG format patch is applied:
http://patchwork.openembedded.org/patch/124953/

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/b4420qds-64b.conf   | 3 ---
 conf/machine/b4420qds.conf       | 3 ---
 conf/machine/b4860qds-64b.conf   | 3 ---
 conf/machine/b4860qds.conf       | 3 ---
 conf/machine/c293pcie.conf       | 1 -
 conf/machine/p2041rdb.conf       | 3 ---
 conf/machine/p3041ds.conf        | 3 ---
 conf/machine/p4080ds.conf        | 3 ---
 conf/machine/p5020ds-64b.conf    | 3 ---
 conf/machine/p5020ds.conf        | 3 ---
 conf/machine/p5040ds-64b.conf    | 3 ---
 conf/machine/p5040ds.conf        | 3 ---
 conf/machine/t1023rdb-64b.conf   | 3 ---
 conf/machine/t1024rdb-64b.conf   | 3 ---
 conf/machine/t1024rdb.conf       | 3 ---
 conf/machine/t1040d4rdb-64b.conf | 3 ---
 conf/machine/t1040d4rdb.conf     | 3 ---
 conf/machine/t1042d4rdb-64b.conf | 3 ---
 conf/machine/t1042d4rdb.conf     | 3 ---
 conf/machine/t2080qds-64b.conf   | 3 ---
 conf/machine/t2080qds.conf       | 3 ---
 conf/machine/t2080rdb-64b.conf   | 3 ---
 conf/machine/t2080rdb.conf       | 3 ---
 conf/machine/t4160qds-64b.conf   | 3 ---
 conf/machine/t4160qds.conf       | 3 ---
 conf/machine/t4240qds-64b.conf   | 3 ---
 conf/machine/t4240qds.conf       | 3 ---
 conf/machine/t4240rdb-64b.conf   | 3 ---
 conf/machine/t4240rdb.conf       | 3 ---
 29 files changed, 85 deletions(-)

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 3708c33..edfd9b3 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "b4:b4420"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "B4420QDS_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
diff --git a/conf/machine/b4420qds.conf b/conf/machine/b4420qds.conf
index cc79eef..a1b9773 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "b4:b4420"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "B4420QDS_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
diff --git a/conf/machine/b4860qds-64b.conf b/conf/machine/b4860qds-64b.conf
index 5a85f8d..ff99d2a 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "b4860qds"
 
diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index e95c589..95d3ce8 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "B4860QDS_config"
 UBOOT_CONFIG[secure-boot] = "B4860QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "b4860qds"
 
diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index 9923f52..19921e0 100644
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -16,7 +16,6 @@ UBOOT_CONFIG[spi] = "C29XPCIE_SPIFLASH_config"
 UBOOT_CONFIG[secboot] = "C29XPCIE_NOR_SECBOOT_config"
 UBOOT_CONFIG[spi-secboot] = "C29XPCIE_SPIFLASH_SECBOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl.bin"
 
 KERNEL_DEVICETREE ?= "c293pcie_36b.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_defconfig"
diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 981d20b..9b91a2c 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P2041RDB_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P2041RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "P2041RDB_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p2041rdb"
 
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index fb1c0a4..13d8530 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P3041DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P3041DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P3041DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p3041ds"
 
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 270c4ab..fe16027 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -15,9 +15,6 @@ UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p4080ds"
 
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 590582c..223031d 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p5020ds"
 
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 47bdd92..9113e2c 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p5020ds"
 
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index e9468b8..cdc69e6 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p5040ds"
 
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 58c85fa..93888e1 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
 UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
 UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot.pbl"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot.pbl"
 
 HV_CFG_M = "p5040ds"
 
diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index c536d7a..ba6284a 100644
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -15,9 +15,6 @@ UBOOT_CONFIG[nand] = "T1023RDB_NAND_config"
 UBOOT_CONFIG[sdcard] = "T1023RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1023RDB_SPIFLASH_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 KERNEL_DEVICETREE ?= "t1023rdb.dtb t1023rdb-usdpaa.dtb t1023rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3l_smp_defconfig"
diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index e69fcd2..be9d57a 100644
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1024rdb"
 
diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 22c9436..3a78cd5 100644
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1024RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1024RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1024RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1024rdb"
 
diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index f4b25f9..4ffeed6 100644
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 2c21d52..50961bb 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 59c0cd9..b73273f 100644
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index fd5c528..3f496fb 100644
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -16,9 +16,6 @@ UBOOT_CONFIG[sdcard] = "T1042D4RDB_SDCARD_config"
 UBOOT_CONFIG[spi] = "T1042D4RDB_SPIFLASH_config"
 UBOOT_CONFIG[secure-boot] = "T1042D4RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t1040rdb"
 
diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 5bea7d8..969f098 100644
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t2080qds"
 
diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 42b095f..c1fab6c 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t2080qds"
 
diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 5ad0535..1d3200e 100644
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t2080rdb"
 
diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 405d096..ba4b29c 100644
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[nand] = "T2080RDB_NAND_config"
 UBOOT_CONFIG[srio-pcie-boot] = "T2080RDB_SRIO_PCIE_BOOT_config"
 UBOOT_CONFIG[secure-boot] = "T2080RDB_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t2080rdb"
 
diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index b245b08..d18d900 100644
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "T4160QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 49f5620..48dacb3 100644
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4160QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4160QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index 93c28c4..911c155 100644
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t4240qds"
 
diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index b006857..0eff892 100644
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -13,9 +13,6 @@ UBOOT_CONFIG ??= "nor secure-boot"
 UBOOT_CONFIG[nor] = "T4240QDS_config"
 UBOOT_CONFIG[secure-boot] = "T4240QDS_SECURE_BOOT_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t4240qds"
 
diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index a88ee5d..14420dc 100644
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t4240rdb"
 
diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 1f014f4..9633a67 100644
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -12,9 +12,6 @@ SOC_FAMILY = "t4:t4240"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"
 
-UBOOT_SOURCE_NAND = "u-boot-with-spl-pbl.bin"
-UBOOT_SOURCE_SPI = "u-boot.pbl"
-UBOOT_SOURCE_SD = "u-boot-with-spl-pbl.bin"
 
 HV_CFG_M = "t4240rdb"
 
-- 
1.9.2



More information about the meta-freescale mailing list