3 files changed, 32 insertions, 6 deletions
diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf
index 1b854582f8..65cbacad41 100644
--- a/conf/machine/gumstix-custom-connex.conf
+++ b/conf/machine/gumstix-custom-connex.conf
@@ -33,8 +33,11 @@ MACHINE_FEATURES  += "sound"
 # if you enable robostix you will need to disable both "lcd" and "touchscreen" features
 #MACHINE_FEATURES  += "robostix"
 
-#MACHINE_FEATURES  += "lcd"
-#MACHINE_FEATURES  += "touchscreen"
+MACHINE_FEATURES  += "lcd"
+MACHINE_FEATURES  += "rgb16"
+#MACHINE_FEATURES  += "rgb18"
+
+MACHINE_FEATURES  += "touchscreen"
 #MACHINE_FEATURES  += "keyboard"
 
 MACHINE_FEATURES  += "pcmcia"
@@ -44,7 +47,11 @@ MACHINE_FEATURES  += "wifi"
 MACHINE_FEATURES  += "ethernet"
 
 MACHINE_FEATURES  += "fat"
-#MACHINE_FEATURES  += "ext2"
+MACHINE_FEATURES  += "ext2"
+
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
 
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
@@ -70,6 +77,7 @@ module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget
 module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_ether', '',d)}
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
+module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
 module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf
index f2488d66e1..5e9360d9b0 100644
--- a/conf/machine/gumstix-custom-verdex.conf
+++ b/conf/machine/gumstix-custom-verdex.conf
@@ -35,6 +35,9 @@ MACHINE_FEATURES  += "sound"
 #MACHINE_FEATURES  += "robostix"
 
 MACHINE_FEATURES  += "lcd"
+#MACHINE_FEATURES  += "rgb16"
+MACHINE_FEATURES  += "rgb18"
+
 MACHINE_FEATURES  += "touchscreen"
 MACHINE_FEATURES  += "keyboard"
 
@@ -47,6 +50,10 @@ MACHINE_FEATURES  += "ethernet"
 MACHINE_FEATURES  += "ext2"
 MACHINE_FEATURES  += "fat"
 
+# enable one of the following if you want to target build for uimage/rootfs on mmc/microSD or CF
+#MACHINE_FEATURES  += "mmcroot"
+#MACHINE_FEATURES  += "cfroot"
+
 #
 # note:  selection of MACHINE_FEATURES above will automatically include necessary kernel modules
 # for those features via task-base-gumstix.  Include below any extra kernel modules that you want installed
@@ -74,5 +81,6 @@ module_autoload_g_ether        = ${@base_contains('MACHINE_FEATURES', 'usbgadget
 #module_autoload_g_serial       = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_serial', '',d)}
 
 module_autoload_tsc2003        = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)}
+module_autoload_ucb1400-ts     = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)}
 module_autoload_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
 
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 1bc0b2e000..8b7d5be188 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -17,7 +17,7 @@ UBOOT_ENTRYPOINT = "a0008000"
 MACHINE_FEATURES += "kernel26 "
 COMBINED_FEATURES ?= ""
 
-IMAGE_FSTYPES = "jffs2"
+IMAGE_FSTYPES = "jffs2 tar.gz"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
@@ -31,8 +31,11 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
 # The following *should* be in a distro.conf file
 # We include them here to avoid creating a new distro
 
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+
 PREFERRED_VERSION_gumstix-kernel = "2.6.21"
-PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_gnuplot = "4.0.0"
 PREFERRED_VERSION_dropbear = "0.47"
 PREFERRED_VERSION_wpa-supplicant = "0.5.8"
@@ -41,4 +44,11 @@ PREFERRED_VERSION_bluez-utils-alsa = "3.24"
 PREFERRED_VERSION_bluez-libs = "3.24"
 PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24"
 PREFERRED_VERSION_bluez-hcidump = "1.40"
-
+PREFERRED_VERSION_microwindows = "0.91"
+PREFERRED_VERSION_midori = "0.0.15"
+PREFERRED_VERSION_jamvm = "1.5.0"
+PREFERRED_VERSION_classpath = "0.96"
+PREFERRED_VERSION_qtopia-core = "4.3.3"
+PREFERRED_VERSION_uicmoc4-native = "4.3.3"
+
+SRCREV_pn-webkit-gtk = "28656"