summaryrefslogtreecommitdiff
path: root/conf/machine/phyflex-imx6-1.conf
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2015-01-26 07:48:58 (GMT)
committerStefan Christ <s.christ@phytec.de>2015-01-28 15:03:20 (GMT)
commitf73808006a26a5d4386fa007f0a4b26144a60b4b (patch)
tree599f0b68aa5d3d2921ced8c0062df35e632b7170 /conf/machine/phyflex-imx6-1.conf
parenta467c4870c780b0bc15763d7f23898b15404bbf3 (diff)
downloadmeta-phytec-f73808006a26a5d4386fa007f0a4b26144a60b4b.zip
meta-phytec-f73808006a26a5d4386fa007f0a4b26144a60b4b.tar.bz2
conf: machine: Add machine feature alsa
Add machine feature 'alsa' to phyCARD-i.MX6 and both phyFLEX-i.MX6 configurations. Also remove machine feature 'alsa' and 'touchscreen' in include file imx-base.inc which is used by all imx6 machine configurations. Otherwise machine features are enabled for all machines. Signed-off-by: Stefan Christ <s.christ@phytec.de>
Diffstat (limited to 'conf/machine/phyflex-imx6-1.conf')
-rw-r--r--conf/machine/phyflex-imx6-1.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/phyflex-imx6-1.conf b/conf/machine/phyflex-imx6-1.conf
index 9834d65..f68445c 100644
--- a/conf/machine/phyflex-imx6-1.conf
+++ b/conf/machine/phyflex-imx6-1.conf
@@ -16,4 +16,4 @@ BAREBOX_BIN = "images/barebox-phytec-pbab01-1gib.img"
BAREBOX_DEFAULT_ENV = "arch/arm/boards/phytec-phyflex-imx6/defaultenv-phyflex-imx6"
# touchscreen, the rdk has one attached
-MACHINE_FEATURES += "touchscreen pci can"
+MACHINE_FEATURES += "touchscreen pci can alsa"