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 <daiane.angolini@freescale.com>

diff --git a/meta-fsl-arm/conf/machine/imx6dlsabresd.conf b/meta-fsl-arm/conf/machine/imx6dlsabresd.conf
index ff92d599f0e57fa757741605ce3610313fc60c34..c56d0d7a93f9f161b6b7c592db12cb4bbe72ca28 100644 (file)
--- 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 eb753efc04b734dcf2eec7362925da06f4e04694..d5c200fb2c43c7d454f2deba8af4ca669efe4913 100644 (file)
--- 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 (file)
index 0000000..96c9714
--- /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"