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

6 files changed, 8 insertions, 10 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/apalis-t30.conf b/conf/machine/apalis-t30.conf
index bbf699f..b47fd3c 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
 
-MACHINE_FEATURES = "kernel26 screen usbgadget usbhost vfat ext2 alsa touchscreen ethernet"
+MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci "
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # used by sysvinit_2
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
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index 8f8565c..dc97caa 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -35,7 +35,7 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
 
-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
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index 2ca53cb..b6ca840 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -37,7 +37,7 @@ PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
 
-MACHINE_FEATURES = "kernel26 screen usbgadget usbhost vfat ext2 alsa touchscreen ethernet wifi bluetooth 3g"
+MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # used by sysvinit_2
diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index fc9c087..2edaeaa 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -8,10 +8,10 @@ DEFAULTTUNE = "armv7ahf-neon"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa5.inc
 
-#TODO
 SOC_FAMILY = "vf:vf60"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
+
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
 UBOOT_SUFFIX = "imx"
@@ -27,7 +27,7 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
 
 SERIAL_CONSOLE = "115200 ttymxc0"
 
-MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa touchscreen ethernet wifi bluetooth 3g"
+MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 #Workaround