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: Chunrong Guo <chunrong.guo@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/p1020rdb.conf b/conf/machine/p1020rdb.conf
index b09bf17d750273ef5b676a4448e496bbea2caec7..50edba7d86b0a9e9627d96889d1aa34281b552fe 100644 (file)
--- a/conf/machine/p1020rdb.conf
+++ b/conf/machine/p1020rdb.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e500v2.inc
 
-SOC_FAMILY = "p1020"
+MACHINEOVERRIDES =. "p1020"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
 
 UBOOT_CONFIG ??= "nand sdcard spi nor"

diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 9a795fef84f2f56f5cf5d1793965bdc8a1bd609c..102cc8dbb0c28153929d2ca1d09a8798c9e5bfc0 100644 (file)
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e500mc.inc
 
-SOC_FAMILY = "p2041"
+MACHINEOVERRIDES =. "p2041"
 
 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 98af31bca75e3dc140eff1822bf4d62167e79e95..c7ce46929f4709b0d8487585ce5173144120a9e1 100644 (file)
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e500mc.inc
 
-SOC_FAMILY = "p3041"
+MACHINEOVERRIDES =. "p3041"
 
 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 84eb4ced97eaf60ca73dd7d9237e673698d898ae..23a7816b0c8ff8b7295b4ba450fc0f0e6954eaa6 100644 (file)
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e500mc.inc
 
-SOC_FAMILY = "p4080"
+MACHINEOVERRIDES =. "p4080"
 
 UBOOT_CONFIG ??= "secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P4080DS_config"

diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 7c36eaea9ac267e17055f788676d4caece64202b..af581f491bcbb736847e4c5c1cb9acaa7712e018 100644 (file)
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e5500.inc
 
-SOC_FAMILY = "p5040"
+MACHINEOVERRIDES =. "p5040"
 
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config"

diff --git a/conf/machine/t1024rdb.conf b/conf/machine/t1024rdb.conf
index 297c9497b144af110b95c25e463665972ab73d5b..616ce3f107b738569499c955abffb8903a507524 100644 (file)
--- a/conf/machine/t1024rdb.conf
+++ b/conf/machine/t1024rdb.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e5500.inc
 
-SOC_FAMILY = "t1:t1024"
+MACHINEOVERRIDES =. "t1:t1024"
 
 UBOOT_CONFIG ??= "nand sdcard spi secure-boot nor"
 UBOOT_CONFIG[nor] = "T1024RDB_config"

diff --git a/conf/machine/t2080rdb.conf b/conf/machine/t2080rdb.conf
index 66e893acbf4efd975739b5505e93b977e3d15c88..b3e45280c14f2ca9bc150bdc805aa6983aef6974 100644 (file)
--- a/conf/machine/t2080rdb.conf
+++ b/conf/machine/t2080rdb.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t2:t2080"
+MACHINEOVERRIDES =. "t2:t2080"
 
 UBOOT_CONFIG ??= "sdcard spi nand srio-pcie-boot secure-boot nor"
 UBOOT_CONFIG[nor] = "T2080RDB_config"

diff --git a/conf/machine/t4240rdb.conf b/conf/machine/t4240rdb.conf
index 160220f40d5b8ef07fc68b163f66bb4d4552deec..f72a49010ff4688ca5f80e61a583eccf48fe82b2 100644 (file)
--- a/conf/machine/t4240rdb.conf
+++ b/conf/machine/t4240rdb.conf
@@ -7,7 +7,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t4:t4240"
+MACHINEOVERRIDES =. "t4:t4240"
 
 UBOOT_CONFIG ??= "nor"
 UBOOT_CONFIG[nor] = "T4240RDB_config"