[meta-freescale] [meta-freescale-layer][PATCH 2/2] Migrate from SOC_FAMILY to MACHINEOVERRIDES
Zhenhua Luo
zhenhua.luo at nxp.com
Mon Sep 12 19:56:19 PDT 2016
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 at nxp.com>
---
conf/machine/b4420qds-64b.conf | 4 ++--
conf/machine/b4420qds.conf | 4 ++--
conf/machine/b4860qds-64b.conf | 4 ++--
conf/machine/b4860qds.conf | 4 ++--
conf/machine/c293pcie.conf | 3 ++-
conf/machine/p2041rdb.conf | 4 ++--
conf/machine/p3041ds.conf | 4 ++--
conf/machine/p4080ds.conf | 4 ++--
conf/machine/p5020ds-64b.conf | 4 ++--
conf/machine/p5020ds.conf | 4 ++--
conf/machine/p5040ds-64b.conf | 4 ++--
conf/machine/p5040ds.conf | 4 ++--
conf/machine/t1023rdb-64b.conf | 4 ++--
conf/machine/t1023rdb.conf | 4 ++--
conf/machine/t1024rdb-64b.conf | 4 ++--
conf/machine/t1024rdb.conf | 4 ++--
conf/machine/t1040d4rdb-64b.conf | 4 ++--
conf/machine/t1040d4rdb.conf | 4 ++--
conf/machine/t1042d4rdb-64b.conf | 4 ++--
conf/machine/t1042d4rdb.conf | 4 ++--
conf/machine/t2080qds-64b.conf | 4 ++--
conf/machine/t2080qds.conf | 4 ++--
conf/machine/t2080rdb-64b.conf | 4 ++--
conf/machine/t2080rdb.conf | 4 ++--
conf/machine/t4160qds-64b.conf | 4 ++--
conf/machine/t4160qds.conf | 4 ++--
conf/machine/t4240qds-64b.conf | 4 ++--
conf/machine/t4240qds.conf | 4 ++--
conf/machine/t4240rdb-64b.conf | 4 ++--
conf/machine/t4240rdb.conf | 4 ++--
30 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index edfd9b3..333ee73 100644
--- a/conf/machine/b4420qds-64b.conf
+++ b/conf/machine/b4420qds-64b.conf
@@ -6,13 +6,13 @@
# 64b mode
#@MAINTAINER: Chunrong Guo <B40290 at 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 a1b9773..e78f6d8 100644
--- a/conf/machine/b4420qds.conf
+++ b/conf/machine/b4420qds.conf
@@ -6,13 +6,13 @@
# 32b mode
#@MAINTAINER: Chunrong Guo <B40290 at 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 b3ef4e6..6dc2a2b 100644
--- a/conf/machine/b4860qds-64b.conf
+++ b/conf/machine/b4860qds-64b.conf
@@ -6,9 +6,9 @@
# 64b mode
#@MAINTAINER: Chunrong Guo <B40290 at 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 eb8ea1a..13fc664 100644
--- a/conf/machine/b4860qds.conf
+++ b/conf/machine/b4860qds.conf
@@ -6,9 +6,9 @@
# 32b mode
#@MAINTAINER: Chunrong Guo <B40290 at 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 82c7153..3cf443b 100644
--- 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 at 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 d6c3878..c36f109 100644
--- 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 at 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 c14b38a..d68f98c 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -5,9 +5,9 @@
# System with ppce500mc core
#@MAINTAINER: Chunrong Guo <B40290 at 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 2e7b4d3..8bafa27 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -5,9 +5,9 @@
# System with ppce500mc core
#@MAINTAINER: Chunrong Guo <B40290 at 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 36aa0c6..717ca41 100644
--- 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 at 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 1455533..748c484 100644
--- 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 at 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 45d82f6..05759ae 100644
--- 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 at 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 7794736..d5ad9a7 100644
--- 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 at 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 086ec76..6120d57 100644
--- 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 at 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 71da38a..1dce7d5 100644
--- 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 at 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 569fa88..cdb77cd 100644
--- 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 at 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 49572fa..9ce6257 100644
--- 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 at 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 68ce8eb..4f00ec6 100644
--- 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 at 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 3673160..456cf44 100644
--- 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 at 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 42d5ca6..7f54beb 100644
--- 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 at 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 00931d4..4fc882a 100644
--- 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 at 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 7c03351..39e5b90 100644
--- 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 at 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 230eb7b..ac63edf 100644
--- 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 at 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 86e1bff..6baa6a7 100644
--- 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 at 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 f0b7d32..4b44c2e 100644
--- 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 at 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 75e4d0f..dbf033c 100644
--- 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 at 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 9c79ad5..1e1b6e5 100644
--- 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 at 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 c5fbe49..8c27cfc 100644
--- 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 at 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 d8ca3cf..41b0898 100644
--- 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 at 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 c9a2da6..7973506 100644
--- 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 at 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 fa4c0b0..5819e20 100644
--- 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 at 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"
--
2.7.4
More information about the meta-freescale
mailing list