From 2fc8578b5733e4b3286d9e7586c0ce8664fa42b8 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Thu, 24 Jul 2014 15:48:13 +0800 Subject: [PATCH] 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 --- meta-fsl-ppc/conf/machine/b4420qds-64b.conf | 2 +- meta-fsl-ppc/conf/machine/b4420qds.conf | 2 +- meta-fsl-ppc/conf/machine/b4860qds-64b.conf | 2 +- meta-fsl-ppc/conf/machine/b4860qds.conf | 2 +- meta-fsl-ppc/conf/machine/t1040rdb-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t1040rdb.conf | 2 +- meta-fsl-ppc/conf/machine/t1042rdb-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t1042rdb.conf | 2 +- meta-fsl-ppc/conf/machine/t2080qds-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t2080qds.conf | 2 +- meta-fsl-ppc/conf/machine/t2080rdb-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t2080rdb.conf | 2 +- meta-fsl-ppc/conf/machine/t4160qds-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t4160qds.conf | 2 +- meta-fsl-ppc/conf/machine/t4240qds-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t4240qds.conf | 2 +- meta-fsl-ppc/conf/machine/t4240rdb-64b.conf | 2 +- meta-fsl-ppc/conf/machine/t4240rdb.conf | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf index a623c84f..c0487d90 100644 --- 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 fa1187b2..94ab1d33 100644 --- 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 3ba56482..acc72d46 100644 --- 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 972d29f8..c2d28edb 100644 --- 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 b4ea5c86..603bc30d 100644 --- 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 684cf8ee..eaac98fa 100644 --- 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 0141e102..c3f78385 100644 --- 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 1f13d86c..feb5049c 100644 --- 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 e2b5682f..6b0f9436 100644 --- 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 dfa6b090..c675aecd 100644 --- 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 5d4eed43..22f3f0fd 100644 --- 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 08d2dd72..67b6d920 100644 --- 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 3f35e57b..970e54eb 100644 --- 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 f87b58e5..66c114e2 100644 --- 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 510b813e..5d1c12ac 100644 --- 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 58e52000..06673fa4 100644 --- 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 ea458957..09740664 100644 --- 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 ec9c5bbc..e4c31f90 100644 --- 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" -- 2.40.1