Migrate from SOC_FAMILY to MACHINEOVERRIDES

MACHINEOVERRIDES way is more straightforward than SOC_FAMILY, so migrate from
SOC_FAMILY to MACHINEOVERRIDES for NXP QorIQ PPC targets.

Signed-off-by: Zhenhua Luo <zhenhua.luo@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 edfd9b331cd43c0d25f935fbe610341cba7f4b7e..333ee73ae5e41a22d0db584fc7821aa1bb3e210b 100644 (file)
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -6,13 +6,13 @@
 #              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
+MACHINEOVERRIDES =. "b4:b4420:"
+
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "b4:b4420"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "B4420QDS_config"
 
-
 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 a1b9773d0e64000445c8a0f5d6904738b63cbe23..e78f6d88512ba37e185b531e2022ad8cf1356504 100644 (file)
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -6,13 +6,13 @@
 #              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
+MACHINEOVERRIDES =. "b4:b4420:"
+
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "b4:b4420"
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "B4420QDS_config"
 
-
 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 b3ef4e693f3e8d63d8fc824515412366e645bfa8..6dc2a2b2939637c42802e103d1265a7602b72517 100644 (file)
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -6,9 +6,9 @@
 #              64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "b4:b4860:"
 
-SOC_FAMILY = "b4:b4860"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "B4860QDS_config"

diff --git a/conf/machine/b4860qds.conf b/conf/machine/b4860qds.conf
index eb8ea1a7e082073af062c7df2603d47738bbf8d2..13fc6648d5c6c0d997a4bed6960e8571f0792999 100644 (file)
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -6,9 +6,9 @@
 #              32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "b4:b4860:"
 
-SOC_FAMILY = "b4:b4860"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "B4860QDS_config"

diff --git a/conf/machine/c293pcie.conf b/conf/machine/c293pcie.conf
index 82c7153e4ada357b0dd1987be59e5820901927d8..3cf443b8cd6889f12f0ee46f4c7a2134ec4405c6 100644 (file)
--- a/conf/machine/c293pcie.conf
+++ b/conf/machine/c293pcie.conf
@@ -5,9 +5,10 @@
 #              PCI Express Adapter Platform with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
+MACHINEOVERRIDES =. "c29x:"
+
 require conf/machine/include/e500v2.inc
 
-SOC_FAMILY = "c293pcie"
 BOOTFORMAT_CONFIG = "config_ddr3_512m_c29xpcie_800M.dat"
 
 UBOOT_CONFIG ??= "spi secboot spi-secboot nor"

diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index d6c3878dd80a41c2ef983a30aa023449c889a9c8..c36f1095bd52ae4dc9dda7e6338c0af389d3542b 100644 (file)
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board, rev2 silicon with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e500mc.inc
+MACHINEOVERRIDES =. "p2041:"
 
-SOC_FAMILY = "p2041"
+require conf/machine/include/e500mc.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P2041RDB_config"

diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index c14b38afb049a314fa4f12e181bfd129d0e3cf13..d68f98c386c3a8813e9fcbd4f5fcae1ab0f613e3 100644 (file)
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -5,9 +5,9 @@
 #              System with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e500mc.inc
+MACHINEOVERRIDES =. "p3041:"
 
-SOC_FAMILY = "p3041"
+require conf/machine/include/e500mc.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P3041DS_config"

diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 2e7b4d3ba1ca20487886088abfab2e9c9d688caf..8bafa278c43b91fadfe7a3fa40a85c2610c36c69 100644 (file)
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -5,9 +5,9 @@
 #              System with ppce500mc core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e500mc.inc
+MACHINEOVERRIDES =. "p4080:"
 
-SOC_FAMILY = "p4080"
+require conf/machine/include/e500mc.inc
 
 UBOOT_CONFIG ??= "secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P4080DS_config"

diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 36aa0c6b8c808e79b0f828d0d418875258976a33..717ca41660999e41f4c650a95287cebb26a15e96 100644 (file)
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -5,9 +5,9 @@
 #              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "p5020:"
 
-SOC_FAMILY = "p5020"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5020DS_config"

diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 1455533d3fe795beb74c02274d562591fc15019a..748c4841e5cb0be3df37c59ee207f1f4f49defb5 100644 (file)
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -5,9 +5,9 @@
 #              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "p5020:"
 
-SOC_FAMILY = "p5020"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5020DS_config"

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 45d82f61cd2fb4d02032a043fe2bf61ff507df80..05759aecd8bec7142974e97cc05e9c5e9e3665cd 100644 (file)
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -5,9 +5,9 @@
 #              System with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "p5040:"
 
-SOC_FAMILY = "p5040"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config"

diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 7794736553636db87e2ec1b6f4b9121381dc7aab..d5ad9a7cea7d14ea00e530b9f2bf062822e3fd19 100644 (file)
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -5,9 +5,9 @@
 #              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "p5040:"
 
-SOC_FAMILY = "p5040"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config"

diff --git a/conf/machine/t1023rdb-64b.conf b/conf/machine/t1023rdb-64b.conf
index 086ec7678126acf35db055afe6ec7999b3f17f72..6120d578dfaae82fcd61836cb95e79d194890c9c 100644 (file)
--- a/conf/machine/t1023rdb-64b.conf
+++ b/conf/machine/t1023rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "t1:t1023:"
 
-SOC_FAMILY = "t1:t1023"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1023RDB_config"

diff --git a/conf/machine/t1023rdb.conf b/conf/machine/t1023rdb.conf
index 71da38a45b6c3d8129fb055093fd83dc4eb32fc6..1dce7d57053be3b0b0184bfba777607bd6cac77b 100644 (file)
--- a/conf/machine/t1023rdb.conf
+++ b/conf/machine/t1023rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "t1:t1023:"
 
-SOC_FAMILY = "t1:t1023"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1023RDB_config"

diff --git a/conf/machine/t1024rdb-64b.conf b/conf/machine/t1024rdb-64b.conf
index 569fa8842f5003f130b1fdd1240647c741a0c4b7..cdb77cd05ffa1f63de17643e1919df6e7713e9be 100644 (file)
--- a/conf/machine/t1024rdb-64b.conf
+++ b/conf/machine/t1024rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "t1:t1024:"
 
-SOC_FAMILY = "t1:t1024"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1024RDB_config"

diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 49572fac34d375e02904a05efa06ddfa3b0c8909..9ce6257b67fc6d90a54b8829ccf9e73b1b9ed9a8 100644 (file)
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "t1:t1024:"
 
-SOC_FAMILY = "t1:t1024"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1024RDB_config"

diff --git a/conf/machine/t1040d4rdb-64b.conf b/conf/machine/t1040d4rdb-64b.conf
index 68ce8eb98c68e88251278bd3a8b59f3ea999fb12..4f00ec6ba843c666813a2ff5239739aa715e5901 100644 (file)
--- a/conf/machine/t1040d4rdb-64b.conf
+++ b/conf/machine/t1040d4rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "t1:t1040:"
 
-SOC_FAMILY = "t1:t1040"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"

diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 3673160f47995afa8cf8b221e1146019b885632c..456cf440fc33de9929408a76fa44e1998a045d40 100644 (file)
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "t1:t1040:"
 
-SOC_FAMILY = "t1:t1040"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1040D4RDB_config"

diff --git a/conf/machine/t1042d4rdb-64b.conf b/conf/machine/t1042d4rdb-64b.conf
index 42d5ca6be86ebe735db2d18c8da3f2f28ac0e432..7f54bebbde21457c2dadfe2c104f8e52f4cbfe84 100644 (file)
--- a/conf/machine/t1042d4rdb-64b.conf
+++ b/conf/machine/t1042d4rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500-64b.inc
+MACHINEOVERRIDES =. "t1:t1042:"
 
-SOC_FAMILY = "t1:t1042"
+require conf/machine/include/e5500-64b.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"

diff --git a/conf/machine/t1042d4rdb.conf b/conf/machine/t1042d4rdb.conf
index 00931d466a7fc7fc12195e7d6a2b117774ba9417..4fc882ad485ec16011b2dcba626c481135f073d3 100644 (file)
--- a/conf/machine/t1042d4rdb.conf
+++ b/conf/machine/t1042d4rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e5500.inc
+MACHINEOVERRIDES =. "t1:t1042:"
 
-SOC_FAMILY = "t1:t1042"
+require conf/machine/include/e5500.inc
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1042D4RDB_config"

diff --git a/conf/machine/t2080qds-64b.conf b/conf/machine/t2080qds-64b.conf
index 7c0335156f07e338e2518760a3db5c953fbfa2cd..39e5b9020e6c2170c8ebf0a2fa8d2046af689ed6 100644 (file)
--- a/conf/machine/t2080qds-64b.conf
+++ b/conf/machine/t2080qds-64b.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "t2:t2080:"
 
-SOC_FAMILY = "t2:t2080"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"

diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 230eb7bbf45781e61a527244a80a6d039b90ccaa..ac63edff301b256e935c5a51aa204f43753466a7 100644 (file)
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "t2:t2080:"
 
-SOC_FAMILY = "t2:t2080"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080QDS_config"

diff --git a/conf/machine/t2080rdb-64b.conf b/conf/machine/t2080rdb-64b.conf
index 86e1bff68a02256dac502a0a950453f77bfd4e7c..6baa6a7282d8203e30bc4c819fb6df43db5c3450 100644 (file)
--- a/conf/machine/t2080rdb-64b.conf
+++ b/conf/machine/t2080rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "t2:t2080:"
 
-SOC_FAMILY = "t2:t2080"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"

diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index f0b7d32876b80202318e647bb390882bccefb19b..4b44c2e1ac11b262a3664fbc3fbec91a186aeed4 100644 (file)
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "t2:t2080:"
 
-SOC_FAMILY = "t2:t2080"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"

diff --git a/conf/machine/t4160qds-64b.conf b/conf/machine/t4160qds-64b.conf
index 75e4d0f7ffdc726c12ce9671c96fea85636bcb81..dbf033c1c0ad2c188bdc13779696bb0f19bef9e0 100644 (file)
--- a/conf/machine/t4160qds-64b.conf
+++ b/conf/machine/t4160qds-64b.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "t4:t4160:"
 
-SOC_FAMILY = "t4:t4160"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4160QDS_config"

diff --git a/conf/machine/t4160qds.conf b/conf/machine/t4160qds.conf
index 9c79ad5a386f6efc1fb298520b55ceb3bbdff3ce..1e1b6e53cd3d3d930333d5485df59930ef2da4ee 100644 (file)
--- a/conf/machine/t4160qds.conf
+++ b/conf/machine/t4160qds.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "t4:t4160:"
 
-SOC_FAMILY = "t4:t4160"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4160QDS_config"

diff --git a/conf/machine/t4240qds-64b.conf b/conf/machine/t4240qds-64b.conf
index c5fbe49d4bef1bef4de86cb0ffb29d71653aa759..8c27cfc5a6c24ce064d2135da66580d2bf1dc434 100644 (file)
--- a/conf/machine/t4240qds-64b.conf
+++ b/conf/machine/t4240qds-64b.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "t4:t4240:"
 
-SOC_FAMILY = "t4:t4240"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4240QDS_config"

diff --git a/conf/machine/t4240qds.conf b/conf/machine/t4240qds.conf
index d8ca3cfc83183a1b600b7c59e0aba85f97685ed8..41b0898870e765ac6c16f6bfa699ab223a958343 100644 (file)
--- a/conf/machine/t4240qds.conf
+++ b/conf/machine/t4240qds.conf
@@ -5,9 +5,9 @@
 #              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "t4:t4240:"
 
-SOC_FAMILY = "t4:t4240"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "secure-boot nor"
 UBOOT_CONFIG[nor] = "T4240QDS_config"

diff --git a/conf/machine/t4240rdb-64b.conf b/conf/machine/t4240rdb-64b.conf
index c9a2da6f4f2609ff15dad0372e3ccf4597126bd1..7973506f04c73ef3e03a9e8e9dd928ba0316eb5a 100644 (file)
--- a/conf/machine/t4240rdb-64b.conf
+++ b/conf/machine/t4240rdb-64b.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce6500 core in 64b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500-64b.inc
+MACHINEOVERRIDES =. "t4:t4240:"
 
-SOC_FAMILY = "t4:t4240"
+require conf/machine/include/e6500-64b.inc
 
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"

diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index fa4c0b0280499d48053946510fb6f1a42867189f..5819e204a5de15ef104daca454a8c4633d9681a8 100644 (file)
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -5,9 +5,9 @@
 #              Design Board with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
-require conf/machine/include/e6500.inc
+MACHINEOVERRIDES =. "t4:t4240:"
 
-SOC_FAMILY = "t4:t4240"
+require conf/machine/include/e6500.inc
 
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"