From cc933ce11a7c4bc4bd2512e42420b73464c0cf05 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Mon, 18 Feb 2013 14:47:59 -0600 Subject: [PATCH] conf/machines: update to use SOC_FAMILY Signed-off-by: Matthew McClintock --- meta-fsl-ppc/conf/machine/b4420qds-64b.conf | 3 +++ 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/mpc8536ds.conf | 2 ++ meta-fsl-ppc/conf/machine/mpc8544ds.conf | 2 ++ meta-fsl-ppc/conf/machine/mpc8548cds.conf | 2 ++ meta-fsl-ppc/conf/machine/mpc8572ds.conf | 2 ++ meta-fsl-ppc/conf/machine/p1010rdb.conf | 2 ++ meta-fsl-ppc/conf/machine/p1020mbg.conf | 2 ++ meta-fsl-ppc/conf/machine/p1020rdb.conf | 2 ++ meta-fsl-ppc/conf/machine/p1020utm.conf | 2 ++ meta-fsl-ppc/conf/machine/p1021rdb.conf | 3 +++ meta-fsl-ppc/conf/machine/p1022ds.conf | 2 ++ meta-fsl-ppc/conf/machine/p1023rds.conf | 2 ++ meta-fsl-ppc/conf/machine/p1024rdb.conf | 2 ++ meta-fsl-ppc/conf/machine/p1025rdb.conf | 3 ++- meta-fsl-ppc/conf/machine/p2020ds.conf | 4 +++- meta-fsl-ppc/conf/machine/p2020rdb.conf | 2 ++ meta-fsl-ppc/conf/machine/p2041rdb.conf | 2 ++ meta-fsl-ppc/conf/machine/p3041ds.conf | 2 ++ meta-fsl-ppc/conf/machine/p4080ds.conf | 2 ++ meta-fsl-ppc/conf/machine/p5020ds-64b.conf | 2 ++ meta-fsl-ppc/conf/machine/p5020ds.conf | 2 ++ meta-fsl-ppc/conf/machine/p5040ds-64b.conf | 2 ++ meta-fsl-ppc/conf/machine/p5040ds.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 ++ 30 files changed, 63 insertions(+), 2 deletions(-) diff --git a/meta-fsl-ppc/conf/machine/b4420qds-64b.conf b/meta-fsl-ppc/conf/machine/b4420qds-64b.conf index 10d162e4..4e8ba850 100644 --- 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 e4527d7e..233d0e77 100644 --- 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 0bc1941b..1d878ae2 100644 --- 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 0da09100..4cdbd229 100644 --- 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 babca86e..e515566f 100644 --- 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 89e1d898..2cacf357 100644 --- 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 631c4cbc..b3a91d91 100644 --- 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 1c06b536..7e598f00 100644 --- 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 9752cc40..bdca3c8c 100644 --- 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 1459698a..b6182bf2 100644 --- 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 1a0e6722..3f4e819a 100644 --- 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 26ff060c..5b8ea270 100644 --- 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 1a42a947..ad7e54fb 100644 --- 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 6445bdc5..20389a2c 100644 --- 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 956f321f..189c5c04 100644 --- 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 2e47e4d0..58c08653 100644 --- 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 c6258330..a7071cb4 100644 --- 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 dd2c9d10..21f62de4 100644 --- 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 7c0f573a..67856b31 100644 --- 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 7cb449b2..ea1594f9 100644 --- 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 e4569aa7..bf036490 100644 --- 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 00a4e845..332a39f4 100644 --- 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 72730970..75be7fdb 100644 --- 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 eb1d73da..06b4f7cc 100644 --- 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 07ed3b2c..68a5a32b 100644 --- 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 bda7facd..e1db0693 100644 --- 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 aa186d4e..eceb0658 100644 --- 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 a8d6a7e4..4ae03bcd 100644 --- 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 7063f9e2..8aae5288 100644 --- 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 9cb3f82d..4aa36a20 100644 --- 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" -- 2.40.1