diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-07-19 14:08:37 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-08-04 11:12:26 +0200 |
| commit | 95e3200fc80f3ecf2cdd53e31a3860f53fe32078 (patch) | |
| tree | 18a200354dd8592d2640747a288ed8ab2fc230e2 /conf | |
| parent | 7700c61d3dffe88e133d860c980b7e9f2f46d9f3 (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.conf | 6 | ||||
| -rw-r--r-- | conf/machine/apalis-t30.conf | 2 | ||||
| -rw-r--r-- | conf/machine/colibri-t20.conf | 2 | ||||
| -rw-r--r-- | conf/machine/colibri-t30.conf | 2 |
4 files changed, 5 insertions, 7 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-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 |