gumstix-machine : Update gumstix machine files from gumstix OE collection.

3 files changed, 181 insertions, 32 deletions

diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf
new file mode 100644
index 0000000000..1b854582f8
--- /dev/null
+++ b/conf/machine/gumstix-custom-connex.conf
@@ -0,0 +1,75 @@
+#
+# Use this file as a starting point for your custom gumstix configuration
+# Edit it to reflect your hardware setup and then save it a parallel location in user.collection
+
+MACHINE_FEATURES += "connex"
+require conf/machine/include/gumstix.inc
+require conf/machine/include/tune-xscale.inc
+
+#
+# Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
+#ROOT_FLASH_SIZE = "3"
+ROOT_FLASH_SIZE = "15"
+
+#
+# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1"
+USE_VT = "0"
+#USE_VT = "1"
+#SYSVINIT_ENABLED_GETTYS = "1"
+
+#
+# Uncomment features that your board set supports
+
+#MACHINE_FEATURES += "usbhost"
+MACHINE_FEATURES += "usbgadget"
+
+MACHINE_FEATURES  += "i2c"
+#MACHINE_FEATURES  += "spi"
+
+MACHINE_FEATURES  += "serial"
+MACHINE_FEATURES  += "bluetooth"
+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  += "keyboard"
+
+MACHINE_FEATURES  += "pcmcia"
+#MACHINE_FEATURES  += "mmc"
+
+MACHINE_FEATURES  += "wifi"
+MACHINE_FEATURES  += "ethernet"
+
+MACHINE_FEATURES  += "fat"
+#MACHINE_FEATURES  += "ext2"
+
+#
+# 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
+
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx"
+
+#
+# Uncomment or add kernel modules that should be autoloaded
+
+module_autoload_proc_gpio      = 'proc_gpio'
+
+module_autoload_pcmcia         = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pcmcia', '',d)}
+module_autoload_pxa2xx_cs      = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pxa2xx_cs', '',d)}
+
+module_autoload_pxamci         = ${@base_contains('MACHINE_FEATURES', 'mmc',        'pxamci', '',d)}
+module_autoload_mmc_block      = ${@base_contains('MACHINE_FEATURES', 'mmc',        'mmc_block', '',d)}
+
+module_autoload_ethernet       = ${@base_contains('MACHINE_FEATURES', 'ethernet',   'ethernet', '',d)}
+
+module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'gumstix_gadget', '',d)}
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_file_storage', '',d)}
+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_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
new file mode 100644
index 0000000000..f2488d66e1
--- /dev/null
+++ b/conf/machine/gumstix-custom-verdex.conf
@@ -0,0 +1,78 @@
+#
+# Use this file as a starting point for your custom gumstix configuration
+# Edit it to reflect your hardware setup and then save it a parallel location in user.collection
+
+MACHINE_FEATURES += "verdex"
+MACHINE_FEATURES += "iwmmxt"
+require conf/machine/include/gumstix.inc
+require conf/machine/include/tune-xscale.inc
+
+#
+# Your flash size = Total flash (in MB) - 1 (for linux kernel partition)
+ROOT_FLASH_SIZE = "15"
+#ROOT_FLASH_SIZE = "31"
+
+#
+# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1"
+#USE_VT = "0"
+USE_VT = "1"
+SYSVINIT_ENABLED_GETTYS = "1"
+
+#
+# Uncomment features that your board set supports
+
+MACHINE_FEATURES += "usbhost"
+#MACHINE_FEATURES += "usbgadget"
+
+MACHINE_FEATURES  += "i2c"
+#MACHINE_FEATURES  += "spi"
+
+MACHINE_FEATURES  += "serial"
+MACHINE_FEATURES  += "bluetooth"
+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  += "keyboard"
+
+MACHINE_FEATURES  += "pcmcia"
+MACHINE_FEATURES  += "mmc"
+
+MACHINE_FEATURES  += "wifi"
+MACHINE_FEATURES  += "ethernet"
+
+MACHINE_FEATURES  += "ext2"
+MACHINE_FEATURES  += "fat"
+
+#
+# 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
+
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx"
+
+#
+# Uncomment or add kernel modules that should be autoloaded
+
+module_autoload_proc_gpio      = 'proc_gpio'
+
+module_autoload_pcmcia         = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pcmcia', '',d)}
+module_autoload_pxa2xx_cs      = ${@base_contains('MACHINE_FEATURES', 'pcmcia',     'pxa2xx_cs', '',d)}
+
+module_autoload_pxamci         = ${@base_contains('MACHINE_FEATURES', 'mmc',        'pxamci', '',d)}
+module_autoload_mmc_block      = ${@base_contains('MACHINE_FEATURES', 'mmc',        'mmc_block', '',d)}
+
+module_autoload_ethernet       = ${@base_contains('MACHINE_FEATURES', 'ethernet',   'ethernet', '',d)}
+
+module_autoload_ohci-hcd       = ${@base_contains('MACHINE_FEATURES', 'usbhost',    'ohci-hcd', '',d)}
+
+module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'gumstix_gadget', '',d)}
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget',  'g_file_storage', '',d)}
+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_evdev          = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)}
+
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index fc5fd4e136..1bc0b2e000 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -2,47 +2,43 @@
 #@Name: Gumstix pxa2xx boards
 #@DESCRIPTION:  Gumstix pxa2xx boards
 
+# Don't edit this file unless you *really* know what you are doing!
+
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel"
 KERNEL_IMAGETYPE = "uImage"
-
-module_autoload_pxamci = "pxamci"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_gumstix_gadget = "gumstix_gadget"
-module_autoload_g_ether = "g_ether"
-module_autoload_smc91x = "smc91x"
-module_autoload_smc911x = "smc911x"
+RDEPENDS_kernel-base = ""
+KERNEL_IMAGE_MAXSIZE = "1048577"
 
 UBOOT_ENTRYPOINT = "a0008000"
 
-#Assume people have some gumstix extension boards 
-MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
-
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
+MACHINE_FEATURES += "kernel26 "
+COMBINED_FEATURES ?= ""
 
-# Install all kernel modules
-#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
 
-# Install only selected kernel modules, comment out line above also
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
-                             kernel-module-rtc-core \
-                             kernel-module-rtc-dev \
-                             kernel-module-rtc-proc \
-                             kernel-module-rtc-sa1100 \
-                             kernel-module-rtc-sysfs \
-                             kernel-module-smc91x \
-                             kernel-module-gumstix-smc91x \
-                             kernel-module-smc911x \
-                             kernel-module-gumstix-smc911x \
-                             "
-
-# used by sysvinit_2
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 
-#don't try to access tty1
-USE_VT = "0"
-
-require conf/machine/include/tune-xscale.inc
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS =     " \
+                                       "
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
+                                       "
+#
+# The following *should* be in a distro.conf file
+# We include them here to avoid creating a new distro
+
+PREFERRED_VERSION_gumstix-kernel = "2.6.21"
+PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_gnuplot = "4.0.0"
+PREFERRED_VERSION_dropbear = "0.47"
+PREFERRED_VERSION_wpa-supplicant = "0.5.8"
+PREFERRED_VERSION_bluez-utils = "3.24"
+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"