summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2012-07-21 19:09:35 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2012-07-21 19:09:35 +0200
commit442363a017b6641f5e4ceef8cac2c3d97284e6ac (patch)
treebd8208c64884c7c8d7cab41035bb9a79249fac16 /conf
parentbe161264010eebc7dc8c408a7059e1640ab96e73 (diff)
removed unneeded apmd from machine features
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/colibri-t20.conf2
-rw-r--r--conf/machine/colibri-t20.conf~61
2 files changed, 1 insertions, 62 deletions
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index af2aa2b..1dcb93e 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -45,7 +45,7 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-t20 = "lxsession"
#PREFERRED_VERSION_eglibc ?= "2.10"
#PREFERRED_VERSION_eglibc-initial ?= "2.10"
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat ext2 alsa touchscreen ethernet"
+MACHINE_FEATURES = "kernel26 screen usbgadget usbhost vfat ext2 alsa touchscreen ethernet"
EXTRA_IMAGEDEPENDS += "u-boot"
# used by sysvinit_2
diff --git a/conf/machine/colibri-t20.conf~ b/conf/machine/colibri-t20.conf~
deleted file mode 100644
index 90aaa06..0000000
--- a/conf/machine/colibri-t20.conf~
+++ /dev/null
@@ -1,61 +0,0 @@
-#@TYPE: Machine
-#@NAME: colibri_t20
-#@DESCRIPTION: Toradex Colibri T20
-
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-colibri-t20"
-#PREFERRED_VERSION_linux = ""
-
-KERNEL_IMAGETYPE = "uImage"
-#UBOOT_MACHINE = "harmony_config"
-#UBOOT_MACHINE = "waluigi_config"
-UBOOT_MACHINE = "colibri_t20_config"
-UBOOT_ENTRYPOINT = "0x00008000"
-#PREFERRED_VERSION_u-boot = "2010.06"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-video-fbdev \
- xf86-input-keyboard"
-# Only has DVI connector for external screen, name is changing to MACHINE_GUI_CLASS
-GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_GUI_CLASS = "bigscreen"
-
-PREFERRED_PROVIDER_lxde-icon-theme_colibri-t20 = "lxde-icon-theme"
-PREFERRED_PROVIDER_lxsession-lite_colibri-t20 = "lxsession"
-PREFERRED_PROVIDER_gdbserver_colibri-t20 = "gdbserver"
-#PREFERRED_PROVIDER_libgobject-2.0_colibri-t20 = "glib-2.0"
-#PREFERRED_PROVIDER_libgmodule-2.0_colibri-t20 = "glib-2.0"
-#PREFERRED_PROVIDER_libgthread-2.0_colibri-t20 = "glib-2.0"
-#PREFERRED_PROVIDER_libgio-2.0_colibri-t20 = "glib-2.0"
-#PREFERRED_VERSION_libgobject-2.0_colibri-t20 = "2.30.1"
-#PREFERRED_VERSION_libgmodule-2.0_colibri-t20 = "2.30.1"
-#PREFERRED_VERSION_libgthread-2.0_colibri-t20 = "2.30.1"
-#PREFERRED_VERSION_libgio-2.0_colibri-t20 = "2.30.1"
-
-#PREFERRED_VERSION_samba_colibri-t20 = "3.6.1"
-#PREFERRED_VERSION_glib-2.0_colibri-t20 = "2.30.1"
-#PREFERRED_VERSION_glib-2.0-native_colibri-t20 = "2.30.1"
-#PREFERRED_VERSION_gtk+_colibri-t20 = "2.24.8"
-#PREFERRED_VERSION_gtk+-native_colibri-t20 = "2.24.8"
-#PREFERRED_VERSION_pango_colibri-t20 = "1.29.4"
-#PREFERRED_VERSION_pango-native_colibri-t20 = "1.29.4"
-
-#ANGSTROM_GCC_VERSION_colibri-t20 = "4.4.4"
-#fix for csl 4.4.1 toolchain not beeing recent enough
-#PREFERRED_VERSION_eglibc ?= "2.10"
-#PREFERRED_VERSION_eglibc-initial ?= "2.10"
-
-MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat ext2 alsa"
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttyS0"
-#IMAGE_FSTYPES ?= "yaffs2"
-
-# T20 does not have neon
-DEFAULTTUNE = "cortexa9"
-require conf/machine/include/tune-cortexa9.inc