Patchwork [meta-fsl-arm-extra,v2,2/3] wandboard.inc: add file with common settings for wandboard boards

login
register
mail settings
Submitter Mario Domenech Goulart
Date Nov. 12, 2013, 1:22 p.m.
Message ID <1384262550-32001-2-git-send-email-mario@ossystems.com.br>
Download mbox | patch
Permalink /patch/61497/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Mario Domenech Goulart - Nov. 12, 2013, 1:22 p.m.
Currently the following variables can be shared among all the
wandboard models: PREFERRED_PROVIDER_virtual/kernel, SERIAL_CONSOLE
and MACHINE_FEATURES.  Move them to a include file to avoid code
duplication.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 conf/machine/include/wandboard.inc |   10 ++++++++++
 conf/machine/wandboard-dual.conf   |    9 ++-------
 conf/machine/wandboard-quad.conf   |    9 ++-------
 conf/machine/wandboard-solo.conf   |    9 +--------
 4 files changed, 15 insertions(+), 22 deletions(-)
 create mode 100644 conf/machine/include/wandboard.inc

Patch

diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
new file mode 100644
index 0000000..d985faf
--- /dev/null
+++ b/conf/machine/include/wandboard.inc
@@ -0,0 +1,10 @@ 
+# Common settings for wandboard boards
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES += "pci wifi"
diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
index 3526790..1821192 100644
--- a/conf/machine/wandboard-dual.conf
+++ b/conf/machine/wandboard-dual.conf
@@ -3,19 +3,14 @@ 
 #@SOC: i.MX6DL
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6dl:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_dl_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
index 578dd0d..195a69f 100644
--- a/conf/machine/wandboard-quad.conf
+++ b/conf/machine/wandboard-quad.conf
@@ -3,19 +3,14 @@ 
 #@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6q:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_quad_config"
 
 KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
 
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "bluetooth"
 
 MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
index aad7876..9696aeb 100644
--- a/conf/machine/wandboard-solo.conf
+++ b/conf/machine/wandboard-solo.conf
@@ -3,17 +3,10 @@ 
 #@SOC: i.MX6S
 #@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
 
-include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+include include/wandboard.inc
 
 SOC_FAMILY = "mx6:mx6s:wandboard"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
-
 UBOOT_MACHINE = "wandboard_solo_config"
 
 KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
-
-SERIAL_CONSOLE = "115200 ttymxc0"
-
-MACHINE_FEATURES += " pci wifi"