conf/machines: update to use SOC_FAMILY

Signed-off-by: Matthew McClintock <msm@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
index 10d162e45392cbef353961d8a155909822b53c29..4e8ba8503bc4b1fb4f023b683d216aa47835aa2b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf
@@ -2,6 +2,9 @@
 #@DESCRIPTION: Machine configuration for running B4420QDS in 64-bit mode
 
 require e6500-64b.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "b4420"
 
 # TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4420QDS"

diff --git a/meta-fsl-ppc/conf/machine/b4420qds.conf b/meta-fsl-ppc/conf/machine/b4420qds.conf
index e4527d7eeb423ed6053cc43a01af8be82bbbb835..233d0e776b92d55da883f3b44ca70b9dd02130f2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4420qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4420qds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running B4420QDS in 32-bit mode
 
 require e6500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "b4420"
 UBOOT_MACHINES ?= "B4420QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/b4420qds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/e6500rev1_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
index 0bc1941b9f2281ced97a8d93c0b9fcf117ab9a63..1d878ae2f77bc2d64653aa75cd326196e6a91b08 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds-64b.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running B4860QDS in 64-bit mode
 
 require e6500-64b.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "b4860"
 # TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/b4860qds.dts \

diff --git a/meta-fsl-ppc/conf/machine/b4860qds.conf b/meta-fsl-ppc/conf/machine/b4860qds.conf
index 0da09100bec6ffec2d6bbecd5df7676fb6d1a21b..4cdbd2292187f0fca0d3a7b487bc12258c2fac07 100644 (file)
--- a/meta-fsl-ppc/conf/machine/b4860qds.conf
+++ b/meta-fsl-ppc/conf/machine/b4860qds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running B4860QDS in 32-bit mode
 
 require e6500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "b4860"
 UBOOT_MACHINES ?= "B4860QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/b4860qds.dts \
        ${S}/arch/powerpc/boot/dts/b4860qds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/mpc8536ds.conf b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
index babca86e2d35c82f1c1680a09018521774db14d3..e515566fc5ad401da8aafb48d3a0e7d801786c40 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8536ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8536ds.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8536DS
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "mpc8536"
 BOOTFORMAT_CONFIG = "config_ddr2_512m_mpc8536ds_667M.dat"
 UBOOT_MACHINES ?= "MPC8536DS MPC8536DS_36BIT MPC8536DS_NAND MPC8536DS_SDCARD MPC8536DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8536ds.dts \

diff --git a/meta-fsl-ppc/conf/machine/mpc8544ds.conf b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
index 89e1d8986c9a8453e68779a76ee6bbd53da95b7a..2cacf357915466341be7ecc66d7a97717c7a5d46 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8544ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8544ds.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8544DS
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "mpc8544"
 UBOOT_MACHINES ?= "MPC8544DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8544ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/mpc8548cds.conf b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
index 631c4cbc0d7d914a0ff66976d0fb8b3acfc0ba0c..b3a91d918d7d288050b768e53e05fc14d4adbf3f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8548cds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8548cds.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale MPC8548CDS
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "mpc8548"
 UBOOT_MACHINES ?= "MPC8548CDS MPC8548CDS_36BIT"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8548cds_32b.dts \
                     ${S}/arch/powerpc/boot/dts/mpc8548cds_36b.dts"

diff --git a/meta-fsl-ppc/conf/machine/mpc8572ds.conf b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
index 1c06b536ab99d6cb1ff227783e6b88ffc4198752..7e598f00d97f4baed012e8f59b87ea1b140250db 100644 (file)
--- a/meta-fsl-ppc/conf/machine/mpc8572ds.conf
+++ b/meta-fsl-ppc/conf/machine/mpc8572ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "mpc8572"
 UBOOT_MACHINES ?= "MPC8572DS MPC8572DS_36BIT MPC8572DS_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8572ds.dts \
                     ${S}/arch/powerpc/boot/dts/mpc8572ds_36b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1010rdb.conf b/meta-fsl-ppc/conf/machine/p1010rdb.conf
index 9752cc40bb82d5e97c61f629e208202915cfe0d4..bdca3c8c49b79ba3c48ac121214e645a4fd940f5 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1010rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1010rdb.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1010RDB
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1010"
 UBOOT_MACHINES ?= "P1010RDB_NAND P1010RDB_NOR"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1010rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/p1020mbg.conf b/meta-fsl-ppc/conf/machine/p1020mbg.conf
index 1459698aa213e77235158ec315cfb6f2a233d714..b6182bf26e18bffa68952a5c0689d08885a60f94 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020mbg.conf
+++ b/meta-fsl-ppc/conf/machine/p1020mbg.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1020MBG
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES ?= "P1020MBG-PC P1020MBG-PC_SDCARD P1020MBG-PC_36BIT P1020MBG-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020mbg-pc_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 1a0e67224bfd2a5d2e406e6a362e358a03e84425..3f4e819a86be46b749c7853a2f2589072a8fd52b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES ?= " P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD P1020RDB-PC_36BIT P1020RDB-PC_36BIT_SPIFLASH P1020RDB-PC_36BIT_NAND P1020RDB-PC_36BIT_SDCARD"
 

diff --git a/meta-fsl-ppc/conf/machine/p1020utm.conf b/meta-fsl-ppc/conf/machine/p1020utm.conf
index 26ff060c72dffbfd4b0836bc9bce6af5052e464b..5b8ea270d67a1e221d7a7981a141fe2fa65c25db 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020utm.conf
+++ b/meta-fsl-ppc/conf/machine/p1020utm.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1020UTM
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1020"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES ?= "P1020UTM-PC P1020UTM-PC_SDCARD P1020UTM-PC_36BIT P1020UTM-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020utm-pc_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1021rdb.conf b/meta-fsl-ppc/conf/machine/p1021rdb.conf
index 1a42a94756981f7beb816df7a118c18c49e32b47..ad7e54fb805cd24180db1e2c32d17fcea02c0799 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1021rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1021rdb.conf
@@ -3,6 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1021RDB
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
+
+SOC_FAMILY = "p1021"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_800M.dat"
 UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1021rdb-pc_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf
index 6445bdc5959fbd66f28c2a6947272fffc6bc7985..20389a2c3f8de5f0d61a4e1cb529751f0b1b2dac 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1022ds.conf
+++ b/meta-fsl-ppc/conf/machine/p1022ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1022"
 BOOTFORMAT_CONFIG = "config_ddr3_2gb_p1022ds.dat"
 UBOOT_MACHINES ?= "P1022DS P1022DS_NAND P1022DS_SPIFLASH P1022DS_SDCARD P1022DS_36BIT P1022DS_36BIT_SPIFLASH P1022DS_36BIT_NAND P1022DS_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1023rds.conf b/meta-fsl-ppc/conf/machine/p1023rds.conf
index 956f321f9fcb059de58ed226251c772dbdacf2fb..189c5c040793be12181de864fc3502634824d210 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1023rds.conf
+++ b/meta-fsl-ppc/conf/machine/p1023rds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1023"
 UBOOT_MACHINES ?= "P1023RDS P1023RDS_NAND"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1023rds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/85xx/p1023rds_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/p1024rdb.conf b/meta-fsl-ppc/conf/machine/p1024rdb.conf
index 2e47e4d0edfe97c9b2cd4b3fb67b26515773dcad..58c086536406f56f2d3adfa0d8937d62e38756ab 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1024rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1024rdb.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1024RDB
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p1024"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES ?= "P1024RDB P1024RDB_36BIT P1024RDB_NAND P1024RDB_SDCARD P1024RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1024rdb_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p1025rdb.conf b/meta-fsl-ppc/conf/machine/p1025rdb.conf
index c6258330785320fda6b357e09af48358e800701d..a7071cb4fc3aa2f79c191741aafcf0105cec2c6a 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1025rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1025rdb.conf
@@ -3,8 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P1025RDB
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
-
+SOC_FAMILY = "p1025"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
 UBOOT_MACHINES ?= "P1025RDB P1025RDB_36BIT P1025RDB_NAND P1025RDB_SDCARD P1025RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1025rdb_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p2020ds.conf b/meta-fsl-ppc/conf/machine/p2020ds.conf
index dd2c9d10943c38f28140b2630131f9b1a00c8251..21f62de4c1207e06b4a746561575781bf15a9bc7 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p2020ds.conf
@@ -2,8 +2,10 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500v2.inc
-BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p2020"
+BOOTFORMAT_CONFIG = "config_sram_p2020ds.dat"
 UBOOT_MACHINES ?= "P2020DS P2020DS_36BIT P2020DS_DDR2 P2020DS_SDCARD P2020DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020ds.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"

diff --git a/meta-fsl-ppc/conf/machine/p2020rdb.conf b/meta-fsl-ppc/conf/machine/p2020rdb.conf
index 7c0f573a0b5d0575e0093aa2fce921183240f9e8..67856b3144f032dc7ac891c25f6c01e337d80d5f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2020rdb.conf
@@ -3,7 +3,9 @@
 #@DESCRIPTION: Machine configuration for the Freescale P2020RDB
 
 require e500v2.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p2020"
 BOOTFORMAT_CONFIG = "config_ddr3_1gb_64bit_p2020rdb_pc.dat"
 UBOOT_MACHINES ?= " P2020RDB-PC P2020RDB-PC_NAND P2020RDB-PC_SDCARD P2020RDB-PC_SPIFLASH P2020RDB-PC_36BIT P2020RDB-PC_36BIT_SPIFLASH P2020RDB-PC_36BIT_NAND P2020RDB-PC_36BIT_SDCARD"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts"

diff --git a/meta-fsl-ppc/conf/machine/p2041rdb.conf b/meta-fsl-ppc/conf/machine/p2041rdb.conf
index 7cb449b27967d5c0698a7453d40a5e1644833415..ea1594f914452498553dc7a7d509841aebd82eb2 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p2041rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p2041rdb.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500mc.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p2041"
 UBOOT_MACHINES ?= "P2041RDB P2041RDB_NAND P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
        ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/p3041ds.conf b/meta-fsl-ppc/conf/machine/p3041ds.conf
index e4569aa708945fa4e1e275f9cb37a13d11703963..bf036490e39d30c1a3897571d0bbea97975bffcb 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p3041ds.conf
+++ b/meta-fsl-ppc/conf/machine/p3041ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500mc.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p3041"
 UBOOT_MACHINES ?= "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SDCARD P3041DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
        ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/p4080ds.conf b/meta-fsl-ppc/conf/machine/p4080ds.conf
index 00a4e84539b448114ec42fda810ed722070110f5..332a39f45685f278aa00d00644a4e5d56c8a4f0b 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p4080ds.conf
+++ b/meta-fsl-ppc/conf/machine/p4080ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e500mc.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p4080"
 UBOOT_MACHINES ?= "P4080DS P4080DS_SECURE_BOOT P4080DS_SDCARD P4080DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
        ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
index 727309709acf1eb42162885300a88f1b9fb8723d..75be7fdb8e0b73b910f94e41f1d059ff93ab19de 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds-64b.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e5500-64b.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p5020"
 # TODO: fix 32bit build of u-boot for p5020ds-64b
 UBOOT_MACHINES ?= "P5020DS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \

diff --git a/meta-fsl-ppc/conf/machine/p5020ds.conf b/meta-fsl-ppc/conf/machine/p5020ds.conf
index eb1d73da83618c33ee77cb26626dd9f2e507ef6f..06b4f7ccbeae9c4606d8c9db2655e929c6700ec5 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5020ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5020ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e5500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p5020"
 UBOOT_MACHINES ?= "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SDCARD P5020DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
        ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
index 07ed3b2c64c4c6816445c6c3ea61885a4941883e..68a5a32b1919c943d4777d444640d840d882eb4e 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds-64b.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e5500-64b.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS  P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
        ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/p5040ds.conf b/meta-fsl-ppc/conf/machine/p5040ds.conf
index bda7facd5eab932c0deed1839a18c112007b6552..e1db06931711ed66107a7bb8540a18828a9f85ed 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p5040ds.conf
+++ b/meta-fsl-ppc/conf/machine/p5040ds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running 
 
 require e5500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "p5040"
 UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT P5040DS_SDCARD P5040DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5040ds.dts \
        ${S}/arch/powerpc/boot/dts/p5040ds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
index aa186d4e536b866a7d52eadd972158af8afb7743..eceb06587abbde73b219379bb7719d55e0071003 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds-64b.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running T4160QDS in 64-bit mode
 
 require e6500-64b.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "t4160"
 # TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \

diff --git a/meta-fsl-ppc/conf/machine/t4160qds.conf b/meta-fsl-ppc/conf/machine/t4160qds.conf
index a8d6a7e46642b82ce1b92ff58e60165f8f3a15a1..4ae03bcd26c1b29615574b88e8e9893bfe42e8f8 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4160qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4160qds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running T4160QDS in 32-bit mode
 
 require e6500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "t4160"
 UBOOT_MACHINES ?= "T4160QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \
        ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts"

diff --git a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
index 7063f9e2a9c46e8c6c1df9a782d059de8a4eb547..8aae52881334d22efb2979db06154ff2e620d84c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds-64b.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running T4240QDS in 64-bit mode
 
 require e6500-64b.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "t4240"
 # TODO: fix 32bit build of u-boot
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \

diff --git a/meta-fsl-ppc/conf/machine/t4240qds.conf b/meta-fsl-ppc/conf/machine/t4240qds.conf
index 9cb3f82d039b49ff613b866ef3120fe7cdbb54b4..4aa36a2077e955ab1c828040592a25047578c2ef 100644 (file)
--- a/meta-fsl-ppc/conf/machine/t4240qds.conf
+++ b/meta-fsl-ppc/conf/machine/t4240qds.conf
@@ -2,7 +2,9 @@
 #@DESCRIPTION: Machine configuration for running T4240QDS in 32-bit mode
 
 require e6500.inc
+require conf/machine/include/soc-family.inc
 
+SOC_FAMILY = "t4240"
 UBOOT_MACHINES ?= "T4240QDS"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/t4240qds.dts \
        ${S}/arch/powerpc/boot/dts/t4240qds-usdpaa.dts"