aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/b4420qds-64b.conf4
-rw-r--r--conf/machine/b4420qds.conf4
-rw-r--r--conf/machine/b4860qds-64b.conf4
-rw-r--r--conf/machine/b4860qds.conf4
-rw-r--r--conf/machine/c293pcie.conf3
-rw-r--r--conf/machine/p2041rdb.conf4
-rw-r--r--conf/machine/p3041ds.conf4
-rw-r--r--conf/machine/p4080ds.conf4
-rw-r--r--conf/machine/p5020ds-64b.conf4
-rw-r--r--conf/machine/p5020ds.conf4
-rw-r--r--conf/machine/p5040ds-64b.conf4
-rw-r--r--conf/machine/p5040ds.conf4
-rw-r--r--conf/machine/t1023rdb-64b.conf4
-rw-r--r--conf/machine/t1023rdb.conf4
-rw-r--r--conf/machine/t1024rdb-64b.conf4
-rw-r--r--conf/machine/t1024rdb.conf4
-rw-r--r--conf/machine/t1040d4rdb-64b.conf4
-rw-r--r--conf/machine/t1040d4rdb.conf4
-rw-r--r--conf/machine/t1042d4rdb-64b.conf4
-rw-r--r--conf/machine/t1042d4rdb.conf4
-rw-r--r--conf/machine/t2080qds-64b.conf4
-rw-r--r--conf/machine/t2080qds.conf4
-rw-r--r--conf/machine/t2080rdb-64b.conf4
-rw-r--r--conf/machine/t2080rdb.conf4
-rw-r--r--conf/machine/t4160qds-64b.conf4
-rw-r--r--conf/machine/t4160qds.conf4
-rw-r--r--conf/machine/t4240qds-64b.conf4
-rw-r--r--conf/machine/t4240qds.conf4
-rw-r--r--conf/machine/t4240rdb-64b.conf4
-rw-r--r--conf/machine/t4240rdb.conf4
30 files changed, 60 insertions, 59 deletions
diff --git a/conf/machine/b4420qds-64b.conf b/conf/machine/b4420qds-64b.conf
index edfd9b33..333ee73a 100644
--- 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 a1b9773d..e78f6d88 100644
--- 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 b3ef4e69..6dc2a2b2 100644
--- 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 eb8ea1a7..13fc6648 100644
--- 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 82c7153e..3cf443b8 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@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 d6c3878d..c36f1095 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@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 c14b38af..d68f98c3 100644
--- 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 2e7b4d3b..8bafa278 100644
--- 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 36aa0c6b..717ca416 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@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 1455533d..748c4841 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@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 45d82f61..05759aec 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@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 77947365..d5ad9a7c 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@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 086ec767..6120d578 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@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 71da38a4..1dce7d57 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@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 569fa884..cdb77cd0 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@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 49572fac..9ce6257b 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@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 68ce8eb9..4f00ec6b 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@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 3673160f..456cf440 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@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 42d5ca6b..7f54bebb 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@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 00931d46..4fc882ad 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@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 7c033515..39e5b902 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@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 230eb7bb..ac63edff 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@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 86e1bff6..6baa6a72 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@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 f0b7d328..4b44c2e1 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@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 75e4d0f7..dbf033c1 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@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 9c79ad5a..1e1b6e53 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@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 c5fbe49d..8c27cfc5 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@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 d8ca3cfc..41b08988 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@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 c9a2da6f..7973506f 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@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 fa4c0b02..5819e204 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@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"