add more generic SOC_FAMILY name t1/t2/t4/b4

currently the SOC_FAMILY name only cover 32b/64b for each one. add
a more generic one to make it more usable.

Signed-off-by: Ting Liu <b28495@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index a623c84f426b8d9eeeda8350aae7da53a75dfdf6..c0487d902ad98fce44c110bcacb27a0ddd4d5b95 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "b4420"
+SOC_FAMILY = "b4:b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
index fa1187b2032f09beeff551313910a79ccb68a6ed..94ab1d33fe1e18d827837f7bfb109c28969157ac 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "b4420"
+SOC_FAMILY = "b4:b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE ?= "b4420qds.dtb b4420qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index 3ba56482e34d87c04f9205491e8f658a972fc03a..acc72d466230f251e6b51b58be70e3b0bd9d5d15 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "b4860"
+SOC_FAMILY = "b4:b4860"
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index 972d29f86b55b7d8ddbd3c856bfe62d5a729edaf..c2d28edbef1ecb466235aaea72631954f8caeaa0 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "b4860"
+SOC_FAMILY = "b4:b4860"
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE ?= "b4860qds.dtb b4860qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
index b4ea5c8669eb12ce9c7fd51f19ba5783944a5c17..603bc30dd49b00fd19459d136a3eacb2feb3eef4 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e5500-64b.inc
 
-SOC_FAMILY = "t1040"
+SOC_FAMILY = "t1:t1040"
 UBOOT_MACHINES ?= "T1040RDB"
 KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t1040rdb.conf b/meta-fsl-ppc/conf/machine/t1040rdb.conf
index 684cf8ee2223eda43f02c2f4e68d936095f6cc67..eaac98fa4a11be9da604352871a34c94c91fe081 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1040rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1040rdb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e5500.inc
 
-SOC_FAMILY = "t1040"
+SOC_FAMILY = "t1:t1040"
 UBOOT_MACHINES ?= "T1040RDB"
 KERNEL_DEVICETREE ?= "t1040rdb.dtb t1040rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf b/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
index 0141e1027a45bb7aebcc7cfa2c4d69c3309ba67c..c3f78385622e4bb9c11298a88ce57260193d75cc 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t1042rdb-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e5500-64b.inc
 
-SOC_FAMILY = "t1042"
+SOC_FAMILY = "t1:t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
 KERNEL_DEVICETREE ?= "t1042rdb_pi.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_64bit_smp_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t1042rdb.conf b/meta-fsl-ppc/conf/machine/t1042rdb.conf
index 1f13d86c97a47513ec3d16a7a934b740eddcb94a..feb5049c5e762737fdfacb72a1785a52d6d763b7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t1042rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t1042rdb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e5500.inc
 
-SOC_FAMILY = "t1042"
+SOC_FAMILY = "t1:t1042"
 UBOOT_MACHINES ?= "T1042RDB_PI"
 KERNEL_DEVICETREE ?= "t1042rdb_pi.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/t1040_32bit_smp_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
index e2b5682fedf26828cdfdccf1522c8ff6f2d3ed22..6b0f943621a4370fba0ca1f2b6b1eca165238679 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "t2080"
+SOC_FAMILY = "t2:t2080"
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t2080qds.conf b/meta-fsl-ppc/conf/machine/t2080qds.conf
index dfa6b090cc2d05607017b78408d90747e355133c..c675aecdcfeb42687564fc81714c7c6a23a7ef71 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080qds.conf
+++ b/meta-fsl-ppc/conf/machine/t2080qds.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t2080"
+SOC_FAMILY = "t2:t2080"
 UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
index 5d4eed43496152657f9d317c641cb8055da1dcea..22f3f0fd1a5e76886443c5b65aca0c419c4185e2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "t2080"
+SOC_FAMILY = "t2:t2080"
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t2080rdb.conf b/meta-fsl-ppc/conf/machine/t2080rdb.conf
index 08d2dd723550b3681fd1f00ee77be425c1f2002a..67b6d920e59536a70a6dc9ce64cc4eacc830ff28 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t2080rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t2080rdb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t2080"
+SOC_FAMILY = "t2:t2080"
 UBOOT_MACHINES ?= "T2080RDB T2080RDB_SDCARD T2080RDB_SPIFLASH T2080RDB_NAND T2080RDB_SRIO_PCIE_BOOT"
 KERNEL_DEVICETREE ?= "t2080rdb.dtb t2080rdb-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index 3f35e57b184776380ca72ae00acb260cbccb69b2..970e54eb2e1c2f5e046f9263afa63cb17a11c919 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "t4160"
+SOC_FAMILY = "t4:t4160"
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index f87b58e5c78663fd5b0631e95bda3c85799a3d37..66c114e2bb0a09e1e954f9b342b3c2d0175f598f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t4160"
+SOC_FAMILY = "t4:t4160"
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index 510b813e7108015f7ec7e0cc7e981024da8ea446..5d1c12ac19ee4081b39a643c8be84f1b7213c9fe 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "t4240"
+SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index 58e5200015f11a8a2b20f1803ae18549fbccb2d1..06673fa439e2a4505f61100e69d2e2b66faeeeb2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t4240"
+SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE ?= "t4240qds.dtb t4240qds-usdpaa.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
index ea458957fdfce0de54aa2aa87aa976fa8f79fc1e..097406643fd952e82f7fad87ee483e275c1f4880 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb-64b.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500-64b.inc
 
-SOC_FAMILY = "t4240"
+SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/t4240rdb.conf b/meta-fsl-ppc/conf/machine/t4240rdb.conf
index ec9c5bbcc229a3492b8b36bc10c8c462c2f4cbcf..e4c31f9052814e2d570f2d5ad97dc17c3c14b01d 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240rdb.conf
+++ b/meta-fsl-ppc/conf/machine/t4240rdb.conf
@@ -6,7 +6,7 @@
 
 require conf/machine/include/e6500.inc
 
-SOC_FAMILY = "t4240"
+SOC_FAMILY = "t4:t4240"
 UBOOT_MACHINES ?= "T4240RDB"
 KERNEL_DEVICETREE ?= "t4240rdb.dtb t4240rdb-usdpaa.dtb t4240rdb-usdpaa-shared-interfaces.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/e6500rev2_defconfig"