remove obsolete UBOOT_SOURCE_* variables in machine file

u-boot has switched to the new UBOOT_CONFIG format. These variables
are useless now.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index 3708c33ad8d33af231463e29462ce73a57ba464c..edfd9b331cd43c0d25f935fbe610341cba7f4b7e 100644 (file)
--- 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 cc79eef55ff7e40c4e06500005141be04778b0ea..a1b9773d0e64000445c8a0f5d6904738b63cbe23 100644 (file)
--- 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 5a85f8ddc64e458f98b0cd5ff835af4086852836..ff99d2a3717db2a4668d2cd4d6b77f0310bdd1ab 100644 (file)
--- 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 e95c589e1c9dafb2cf75d53fd48336c4fc0cf34d..95d3ce83942a5a6a5c86a9c62f72b5325f052fb9 100644 (file)
--- 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 9923f52b77d0c50052e1c0e41bc6089e8c19b134..19921e0e60aaaf50f29258587bcabac9cba74f25 100644 (file)
--- 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 981d20bdf696c2e90c74bf48e96c3eb5ab7016ad..9b91a2cde12c63f130dbeac5a2e2c3afeeb24652 100644 (file)
--- 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 fb1c0a44f9c7069ed9cf32061e2fdb85327037cd..13d8530b4aac7f14251a4222572a0fc49422588e 100644 (file)
--- 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 270c4ab51904b80b0d76ad4151bcd08f9db365fc..fe160272b60eb89f697ee573a50ce512c077f70e 100644 (file)
--- 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 590582c34ac3610d514d35a2d40ce985e7465c0e..223031de22fb5b1f173f862e74e3675f36f9c019 100644 (file)
--- 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 47bdd92c7c3cb2ad3d64710564a41f8bea691712..9113e2c1582a4045b2b316b8b61052c2b0e85445 100644 (file)
--- 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 e9468b86b63d15abea24c9f6f6aa3925b8cea0f7..cdc69e63c438696790a07c15ba36d947d8694596 100644 (file)
--- 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 58c85faac9b15b61960787eb78154e2c5338ac04..93888e1ae66e2f0f7498e49a68abe89d1239a362 100644 (file)
--- 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 c536d7a2c079f56940bf37864a9520f10063c435..ba6284a1e1bb42b00f3b963fd4a16354be3e7a85 100644 (file)
--- 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 e69fcd23b25b83cc1e32aef3d2b52473ed3921b7..be9d57a7165e90a53375306ceb237c29481b0f2b 100644 (file)
--- 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 22c9436468111af9e936918aaa90c392ae168a3d..3a78cd5883733abb0589e74e8540fc618b139518 100644 (file)
--- 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 f4b25f90757af261072941c97ac5fefe5d3e2866..4ffeed65a05aaa89c85ec59847a392aa88cf82ea 100644 (file)
--- 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 2c21d529a095afe4f0864218cc05973ed85249cf..50961bb2283730449e6b956ff3f7ec5d60c1eb9c 100644 (file)
--- 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 59c0cd94ee8664af8fef42d7a9b75e6e1a9e5d55..b73273f4aae6206ed9b89120e7436bc42d070272 100644 (file)
--- 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 fd5c5287df2a05a0000c5f84b1832400d994c98a..3f496fb6d4d024e3e1fa96e83199e4c369b715fa 100644 (file)
--- 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 5bea7d872e40ebb757ebc6674e173a19ab003c47..969f0986d58d787838dc920578de19f680277a32 100644 (file)
--- 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 42b095f425ce192624b4577ea13b5f42369a5e4d..c1fab6c21f5a5d44c47c3fd7812e4c85c344bdee 100644 (file)
--- 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 5ad05354f31709dcc02ca9e08cc1881c4a9dec95..1d3200ec3a9d1db7394c5443391e02b137510727 100644 (file)
--- 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 405d0968c752a51c592bc1d6f6764e108ff42b2b..ba4b29c97c66ed3f4a12a2fe16785d474aff4a31 100644 (file)
--- 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 b245b08ebcc8fbfa3bef9094ce145e63b7657175..d18d9000d1cc64c71ab5cd33a6e39ca2be36d6cb 100644 (file)
--- 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 49f5620f162ab35bac17c1465fd356c16e363804..48dacb3b76598f496a081895f6196133c96ba45b 100644 (file)
--- 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 93c28c410a455a904fd6cbefbaf72bb07c81ca86..911c155d7caa82ad38de22550721130325188b4d 100644 (file)
--- 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 b006857f532d221ee923006a19fefd9559f12547..0eff8929e4d1eebf08ec2a9d042e647384ee9da9 100644 (file)
--- 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 a88ee5d95b0b42565962afb52dbcc41e205bbc89..14420dcc952c148e4f6785d5e0d819be9284e8ed 100644 (file)
--- 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 1f014f40add017f5e66d034ceb89020db7daabcc..9633a6780055217d08bb9a557ad79906e5158698 100644 (file)
--- 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"