From 90c00bba1ce3d3df78138c146323c7244099aa26 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 1 Jul 2016 11:15:40 -0300 Subject: Convert SOC_FAMILY to MACHINEOVERRIDES The SOC_FAMILY is an indirection which makes the understanding, from OpenEmbedded versed developers and users, more difficult. Instead of using the SOC_FAMILY indirection which is rarely used, we now move to the MACHINEOVERRIDES mechanism as this is in fact what is in use. Change-Id: Ic6e58b79bdc990ac853c87761c3fff635786e4e5 Signed-off-by: Otavio Salvador --- conf/machine/imx23evk.conf | 4 ++-- conf/machine/imx28evk.conf | 4 ++-- conf/machine/imx51evk.conf | 4 ++-- conf/machine/imx53ard.conf | 4 ++-- conf/machine/imx53qsb.conf | 4 ++-- conf/machine/imx6dlsabreauto.conf | 4 ++-- conf/machine/imx6dlsabresd.conf | 4 ++-- conf/machine/imx6qpsabreauto.conf | 4 ++-- conf/machine/imx6qpsabresd.conf | 4 ++-- conf/machine/imx6qsabreauto.conf | 4 ++-- conf/machine/imx6qsabresd.conf | 4 ++-- conf/machine/imx6slevk.conf | 4 ++-- conf/machine/imx6solosabreauto.conf | 4 ++-- conf/machine/imx6solosabresd.conf | 4 ++-- conf/machine/imx6sxsabreauto.conf | 4 ++-- conf/machine/imx6sxsabresd.conf | 4 ++-- conf/machine/imx6ulevk.conf | 4 ++-- conf/machine/imx7dsabresd.conf | 4 ++-- conf/machine/include/imx-base.inc | 2 -- conf/machine/include/qoriq-arm.inc | 2 -- conf/machine/ls1021atwr.conf | 4 ++-- conf/machine/twr-vf65gs10.conf | 4 ++-- qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc | 2 +- 23 files changed, 41 insertions(+), 45 deletions(-) diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 6ec1f14..6c4daa5 100644 --- a/conf/machine/imx23evk.conf +++ b/conf/machine/imx23evk.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX23 Evaluation Kit #@MAINTAINER: Otavio Salvador +MACHINEOVERRIDES =. "mxs:mx23:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-arm926ejs.inc -SOC_FAMILY = "mxs:mx23" - IMXBOOTLETS_MACHINE = "stmp378x_dev" UBOOT_MACHINE = "mx23evk_config" diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf index ac4cef5..5bdbcad 100644 --- a/conf/machine/imx28evk.conf +++ b/conf/machine/imx28evk.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX28 Evaluation Kit #@MAINTAINER: Otavio Salvador +MACHINEOVERRIDES =. "mxs:mx28:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-arm926ejs.inc -SOC_FAMILY = "mxs:mx28" - IMXBOOTLETS_MACHINE = "iMX28_EVK" UBOOT_CONFIG ??= "sd" diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf index 9d7d06c..e6904f9 100644 --- a/conf/machine/imx51evk.conf +++ b/conf/machine/imx51evk.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX51 Evaluation Kit #@MAINTAINER: Daiane Angolini +MACHINEOVERRIDES =. "mx5:mx51:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx5:mx51" - # Disable perf features as 2.6.35.3 fails to build otherwise PERF_FEATURES_ENABLE = "" diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index c338d6b..f416c95 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX53 SABRE Automotive Board #@MAINTAINER: Daiane Angolini +MACHINEOVERRIDES =. "mx5:mx53:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx5:mx53" - # Disable perf features as 2.6.35.3 fails to build otherwise PERF_FEATURES_ENABLE = "" diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index 5df85a9..dc264c4 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX53 Quick Start Board #@MAINTAINER: Trevor Woerner +MACHINEOVERRIDES =. "mx5:mx53:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa8.inc -SOC_FAMILY = "mx5:mx53" - KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" UBOOT_MACHINE = "mx53loco_config" diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf index a9bdfe5..3df479b 100644 --- a/conf/machine/imx6dlsabreauto.conf +++ b/conf/machine/imx6dlsabreauto.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive #@MAINTAINER: Daiane Angolini -require conf/machine/include/imx6sabreauto-common.inc +MACHINEOVERRIDES =. "mx6:mx6dl:" -SOC_FAMILY = "mx6:mx6dl" +require conf/machine/include/imx6sabreauto-common.inc KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb" diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf index f832666..9943246 100644 --- a/conf/machine/imx6dlsabresd.conf +++ b/conf/machine/imx6dlsabresd.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device #@MAINTAINER: Otavio Salvador -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6dl:" -SOC_FAMILY = "mx6:mx6dl" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \ imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb" diff --git a/conf/machine/imx6qpsabreauto.conf b/conf/machine/imx6qpsabreauto.conf index b227338..f8e914a 100644 --- a/conf/machine/imx6qpsabreauto.conf +++ b/conf/machine/imx6qpsabreauto.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Automotive #@MAINTAINER: Lauren Post -require conf/machine/include/imx6sabreauto-common.inc +MACHINEOVERRIDES =. "mx6:mx6q:" -SOC_FAMILY = "mx6:mx6q" +require conf/machine/include/imx6sabreauto-common.inc KERNEL_DEVICETREE = "imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \ imx6qp-sabreauto-gpmi-weim.dtb" diff --git a/conf/machine/imx6qpsabresd.conf b/conf/machine/imx6qpsabresd.conf index 2e7ee47..123a435 100644 --- a/conf/machine/imx6qpsabresd.conf +++ b/conf/machine/imx6qpsabresd.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6QP SABRE Smart Device #@MAINTAINER: Lauren Post -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6q:" -SOC_FAMILY = "mx6:mx6q" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6qp-sabresd.dtb imx6qp-sabresd-ldo.dtb imx6qp-sabresd-btwifi.dtb imx6qp-sabresd-hdcp.dtb" diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf index 3429551..e25a733 100644 --- a/conf/machine/imx6qsabreauto.conf +++ b/conf/machine/imx6qsabreauto.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive #@MAINTAINER: Daiane Angolini -require conf/machine/include/imx6sabreauto-common.inc +MACHINEOVERRIDES =. "mx6:mx6q:" -SOC_FAMILY = "mx6:mx6q" +require conf/machine/include/imx6sabreauto-common.inc KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \ imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb" diff --git a/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf index 8115dfa..33fff89 100644 --- a/conf/machine/imx6qsabresd.conf +++ b/conf/machine/imx6qsabresd.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device #@MAINTAINER: Otavio Salvador -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6q:" -SOC_FAMILY = "mx6:mx6q" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \ imx6q-sabresd-enetirq.dtb imx6q-sabresd-btwifi.dtb" diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 98402f7..02cb8f0 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6SL Evaluation Kit #@MAINTAINER: Otavio Salvador +MACHINEOVERRIDES =. "mx6:mx6sl:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa9.inc -SOC_FAMILY = "mx6:mx6sl" - KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ imx6sl-evk-uart.dtb imx6sl-evk-btwifi.dtb" diff --git a/conf/machine/imx6solosabreauto.conf b/conf/machine/imx6solosabreauto.conf index ead787d..3ced78d 100644 --- a/conf/machine/imx6solosabreauto.conf +++ b/conf/machine/imx6solosabreauto.conf @@ -3,9 +3,9 @@ #@SOC: i.MX6S #@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6dl:" -SOC_FAMILY = "mx6:mx6dl" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb" diff --git a/conf/machine/imx6solosabresd.conf b/conf/machine/imx6solosabresd.conf index b123d8c..24fa649 100644 --- a/conf/machine/imx6solosabresd.conf +++ b/conf/machine/imx6solosabresd.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Smart Device #@MAINTAINER: Otavio Salvador -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6dl:" -SOC_FAMILY = "mx6:mx6dl" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb" diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 9c8a01f..4f399a3 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre Automotive #@MAINTAINER: Lauren Post -require conf/machine/include/imx6sabreauto-common.inc +MACHINEOVERRIDES =. "mx6:mx6sx:" -SOC_FAMILY = "mx6:mx6sx" +require conf/machine/include/imx6sabreauto-common.inc KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb imx6sx-sabreauto-m4.dtb" diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index 2243d1f..857b735 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf @@ -4,9 +4,9 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6SoloX Sabre SD #@MAINTAINER: Lauren Post -require conf/machine/include/imx6sabresd-common.inc +MACHINEOVERRIDES =. "mx6:mx6sx:" -SOC_FAMILY = "mx6:mx6sx" +require conf/machine/include/imx6sabresd-common.inc KERNEL_DEVICETREE = "imx6sx-sdb.dtb imx6sx-sdb-emmc.dtb imx6sx-sdb-m4.dtb \ imx6sx-sdb-sai.dtb imx6sx-sdb-lcdif1.dtb imx6sx-sdb-ldo.dtb \ diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 8e2fef0..7ab0963 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf @@ -4,13 +4,13 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX6UL EVK #@MAINTAINER: Lauren Post +MACHINEOVERRIDES =. "mx6ul:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += " pci wifi bluetooth" -SOC_FAMILY = "mx6ul" - KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-evk-btwifi.dtb" UBOOT_SUFFIX = "img" diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 673207f..5d74997 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf @@ -4,13 +4,13 @@ #@DESCRIPTION: Machine configuration for Freescale i.MX7D SABRE Smart Device #@MAINTAINER: Lauren Post +MACHINEOVERRIDES =. "mx7:mx7d:" + require conf/machine/include/imx-base.inc require conf/machine/include/tune-cortexa7.inc MACHINE_FEATURES += " pci wifi bluetooth" -SOC_FAMILY = "mx7:mx7d" - KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \ imx7d-sdb-m4.dtb imx7d-sdb-mipi-dsi.dtb imx7d-sdb-qspi.dtb \ imx7d-sdb-reva.dtb imx7d-sdb-reva-epdc.dtb imx7d-sdb-reva-gpmi-weim.dtb \ diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 1d7993c..a6db038 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -3,8 +3,6 @@ include conf/machine/include/fsl-default-settings.inc include conf/machine/include/fsl-default-versions.inc -include conf/machine/include/soc-family.inc - # Set specific make target and binary suffix PREFERRED_PROVIDER_u-boot ??= "u-boot-fslc" PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-fslc" diff --git a/conf/machine/include/qoriq-arm.inc b/conf/machine/include/qoriq-arm.inc index 20a7594..2ae1963 100644 --- a/conf/machine/include/qoriq-arm.inc +++ b/conf/machine/include/qoriq-arm.inc @@ -1,5 +1,3 @@ -require conf/machine/include/soc-family.inc - # Freescale BSP default providers PREFERRED_PROVIDER_u-boot_ls102xa ?= "u-boot-ls1" PREFERRED_PROVIDER_virtual/bootloader_ls102xa ?= "u-boot-ls1" diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index 4478e95..2cf5916 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode #@MAINTAINER: Zhenhua Luo +MACHINEOVERRIDES =. "ls102xa:" + require conf/machine/include/qoriq-arm.inc require conf/machine/include/tune-cortexa7.inc -SOC_FAMILY = "ls102xa" - UBOOT_CONFIG ??= "nor" UBOOT_CONFIG[nor] = "ls1021atwr_nor_config" UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard" diff --git a/conf/machine/twr-vf65gs10.conf b/conf/machine/twr-vf65gs10.conf index dd5a21a..c14ee5b 100644 --- a/conf/machine/twr-vf65gs10.conf +++ b/conf/machine/twr-vf65gs10.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for Freescale Vybrid TWR-VF65GS10 #@MAINTAINER: Stefan Agner +MACHINEOVERRIDES =. "vf:vf60:" + include conf/machine/include/imx-base.inc include conf/machine/include/tune-cortexa5.inc -SOC_FAMILY = "vf:vf60" - PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc" UBOOT_MACHINE = "vf610twr_config" diff --git a/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 0efb564..5c4a39c 100644 --- a/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" python __anonymous () { families = ['mx6'] - cur_families = (d.getVar('SOC_FAMILY', True) or '').split(':') + cur_families = (d.getVar('MACHINEOVERRIDES', True) or '').split(':') if any(map(lambda x: x in cur_families, families)): d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') -- cgit v1.2.3-54-g00ecf