From b4307807ac3c9485f8b7c7e1941f6fef6085e923 Mon Sep 17 00:00:00 2001 From: Daiane Angolini Date: Thu, 1 Aug 2013 10:17:02 -0300 Subject: [PATCH] imx6sabresd-common.inc: Create file for SABRE SD common Freescale i.MX6 SABRE SD machines have some common configuration. This file is used in order to avoid duplicating in all SABRE SD boards. Replace any 'include' to 'require' to make sure an error is launched in case the file is missing. Change-Id: Ic50956c49a35c2e4f0af6c21e7495cce42698b56 Signed-off-by: Daiane Angolini --- meta-fsl-arm/conf/machine/imx6dlsabresd.conf | 7 +------ meta-fsl-arm/conf/machine/imx6qsabresd.conf | 7 +------ meta-fsl-arm/conf/machine/include/imx6sabresd-common.inc | 8 ++++++++ 3 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 meta-fsl-arm/conf/machine/include/imx6sabresd-common.inc diff --git a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf index ff92d599..c56d0d7a 100644 --- a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf +++ b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf @@ -3,15 +3,10 @@ #@SOC: i.MX6DL #@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Smart Device -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +require conf/machine/include/imx6sabresd-common.inc SOC_FAMILY = "mx6:mx6dl" KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabresd.dts" UBOOT_MACHINE = "mx6dlsabresd_config" - -SERIAL_CONSOLE = "115200 ttymxc0" - -MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf index eb753efc..d5c200fb 100644 --- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf +++ b/meta-fsl-arm/conf/machine/imx6qsabresd.conf @@ -3,15 +3,10 @@ #@SOC: i.MX6Q #@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device -include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +require conf/machine/include/imx6sabresd-common.inc SOC_FAMILY = "mx6:mx6q" KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts" UBOOT_MACHINE = "mx6qsabresd_config" - -SERIAL_CONSOLE = "115200 ttymxc0" - -MACHINE_FEATURES += " pci wifi bluetooth" diff --git a/meta-fsl-arm/conf/machine/include/imx6sabresd-common.inc b/meta-fsl-arm/conf/machine/include/imx6sabresd-common.inc new file mode 100644 index 00000000..96c97140 --- /dev/null +++ b/meta-fsl-arm/conf/machine/include/imx6sabresd-common.inc @@ -0,0 +1,8 @@ +# Provides the i.MX6 SABRE SD common settings + +require conf/machine/include/imx-base.inc +require conf/machine/include/tune-cortexa9.inc + +SERIAL_CONSOLE = "115200 ttymxc0" + +MACHINE_FEATURES += " pci wifi bluetooth" -- 2.40.1