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
commit8f5a02df473c3178703bd85064c4b4cda57e1c39 (patch)
tree31df85e680bb2e2ea1dd3fd07c3786149aaa43b1 /conf
parenta079ff0d364c91e8555c916075ca0149c29c212a (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
-rw-r--r--conf/machine/colibri-pxa.conf2
2 files changed, 3 insertions, 5 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"
diff --git a/conf/machine/colibri-pxa.conf b/conf/machine/colibri-pxa.conf
index 677c0e5..8428862 100644
--- a/conf/machine/colibri-pxa.conf
+++ b/conf/machine/colibri-pxa.conf
@@ -25,7 +25,7 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-pxa = "lxsession"
PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
-MACHINE_FEATURES = "kernel26 screen usbgadget usbhost vfat ext2 alsa touchscreen ethernet"
+MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g "
EXTRA_IMAGEDEPENDS += "u-boot"
# used by sysvinit_2