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
commitb81ada92f81edd21f5d9917f44d1a2588cbefc33 (patch)
tree1cc98eda576294b7168d190109d991e31f38ffa8 /conf
parentcf5528f0507f3f5f847f16c0e2b59edc04057e99 (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-vf.conf4
2 files changed, 4 insertions, 6 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-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