From: Chunrong Guo <chunrong.guo@nxp.com>
Date: Mon, 17 Dec 2018 06:18:27 +0000 (+0000)
Subject: Migrate from SOC_FAMILY to MACHINEOVERRIDES
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=462f360b11dbed2e15c571c4717994a5e617fabd;p=meta-freescale.git

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 b09bf17d..50edba7d 100644
--- 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 9a795fef..102cc8db 100644
--- 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 98af31bc..c7ce4692 100644
--- 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 84eb4ced..23a7816b 100644
--- 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 7c36eaea..af581f49 100644
--- 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 297c9497..616ce3f1 100644
--- 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 66e893ac..b3e45280 100644
--- 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 160220f4..f72a4901 100644
--- 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"