summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-07-19 14:08:37 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2014-08-04 11:12:26 +0200
commit46254739055e5bf6231fab77a88d6cab91735155 (patch)
treedb5518e4c3ffcf24e5daa5b0b37a78c763c8b710 /conf
parent237dc88950b84db0a446048bc41e992d4bee0459 (diff)
machine.conf: unify MACHINE_FEATURES
unify the features between machines kernel26 is deprecated and unused apm does not make sense on ARM While at it remove some commented stuff
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx6.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 0b842ae..10e7fc8 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -16,11 +16,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
# Ensure boot scripts will be available at rootfs time
#do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
-# Boot scripts to install
-#BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
-
UBOOT_MACHINE = "apalis_imx6q1g_config"
SERIAL_CONSOLE = "115200 ttymxc1"
-MACHINE_FEATURES += " pci wifi bluetooth"
+MACHINE_FEATURES += "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci "
+EXTRA_IMAGEDEPENDS += "u-boot"