Patchwork [meta-fsl-arm,2/7] imx6sabresd-common.inc: Create file for SABRE SD common

login
register
mail settings
Submitter Otavio Salvador
Date Aug. 6, 2013, 5:33 p.m.
Message ID <1375810400-1854-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/55197/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Aug. 6, 2013, 5:33 p.m.
From: Daiane Angolini <daiane.angolini@freescale.com>

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>
---
 conf/machine/imx6dlsabresd.conf             | 7 +------
 conf/machine/imx6qsabresd.conf              | 7 +------
 conf/machine/include/imx6sabresd-common.inc | 8 ++++++++
 3 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 conf/machine/include/imx6sabresd-common.inc

Patch

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index ff92d59..c56d0d7 100644
--- a/conf/machine/imx6dlsabresd.conf
+++ b/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/conf/machine/imx6qsabresd.conf b/conf/machine/imx6qsabresd.conf
index eb753ef..d5c200f 100644
--- a/conf/machine/imx6qsabresd.conf
+++ b/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/conf/machine/include/imx6sabresd-common.inc b/conf/machine/include/imx6sabresd-common.inc
new file mode 100644
index 0000000..96c9714
--- /dev/null
+++ b/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"