Patchwork [meta-fsl-arm-extra,1/2] cubox-i: Stop including imx6sabresd-common

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 28, 2014, 8:15 p.m.
Message ID <1393618513-25323-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/67761/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Feb. 28, 2014, 8:15 p.m.
The CuBox-i is not a directly based board of i.MX6 SabreSD board and
we shouldn't depend on that file otherwise changes in that file may
affect cubox-i based images and this is not desired.

Change-Id: Ie368da88caf98284e7fbbdee97f5e98f7563d051
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/cubox-i.conf | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
index e13f1c0..49bee7d 100644
--- a/conf/machine/cubox-i.conf
+++ b/conf/machine/cubox-i.conf
@@ -9,7 +9,8 @@ 
 # machine type upon booting. SOC_FAMILY includes all SoCs from all of these machines
 # to let recipes include firmware etc. for all of these SoCs.
 
-require conf/machine/include/imx6sabresd-common.inc
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6s:mx6dl:mx6q"
 
@@ -26,4 +27,7 @@  SPL_BINARY = "SPL"
 
 BOOT_SCRIPTS = "${UENV_FILENAME}:uEnv.txt"
 
-MACHINE_FEATURES += "alsa bluetooth irda serial usbhost wifi"
+MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth irda serial usbhost wifi"
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+SERIAL_CONSOLE = "115200 ttymxc0"