From 46254739055e5bf6231fab77a88d6cab91735155 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Sat, 19 Jul 2014 14:08:37 +0200
Subject: 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
---
 conf/machine/apalis-imx6.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'conf')

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"
-- 
cgit v1.2.3