merge of '15abe433106a3416f43fe1507eb0032a960434bb'

     and '2538d8c9c6f9647baba548394a1e20a2e4467a19'

38 files changed, 219 insertions, 147 deletions

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index d833fe922f..ec8a5b9b30 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -87,16 +87,44 @@ PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
+#powerpc needs additional patches to gcc
+PREFERRED_VERSION_gcc_dht-walnut               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_dht-walnut         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_dht-walnut     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_xilinx-ml403               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_xilinx-ml403         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1"
+
+PREFERRED_VERSION_gcc_mpc8323e-rdb               ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross_mpc8323e-rdb         ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb     ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1"
+
 PREFERRED_VERSION_gcc               ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross-sdk     ?= "4.2.2"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
 
+
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
 
+#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
+PREFERRED_VERSION_gcc_avr32               = "4.1.2"
+PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
 
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 82c31cb64a..156b5b21a3 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1305,7 +1305,7 @@ PREFERRED_VERSION_nano ?= "2.0.6"
 PREFERRED_VERSION_nasm-native ?= "0.98.38"
 PREFERRED_VERSION_nautilus ?= "2.12.2"
 PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
-PREFERRED_VERSION_navit ?= "0.0.1"
+PREFERRED_VERSION_navit ?= "0.0.3"
 PREFERRED_VERSION_nbd ?= "2.8.7"
 PREFERRED_VERSION_ncftp ?= "3.2.0"
 PREFERRED_VERSION_ncmpc ?= "0.11.1"
@@ -1538,7 +1538,6 @@ PREFERRED_VERSION_python-pylinda ?= "0.6"
 PREFERRED_VERSION_python-pylint ?= "0.13.2"
 PREFERRED_VERSION_python-pymetar ?= "0.11"
 PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
-PREFERRED_VERSION_python-pyqt ?= "4.3"
 PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
@@ -1560,7 +1559,6 @@ PREFERRED_VERSION_python-scons-native ?= "0.97"
 PREFERRED_VERSION_python-setuptools ?= "0.6c6"
 PREFERRED_VERSION_python-sgmlop ?= "1.1"
 PREFERRED_VERSION_python-simplejson ?= "1.7.1"
-PREFERRED_VERSION_python-sip ?= "4.7"
 PREFERRED_VERSION_python-snmplib ?= "0.1.1"
 PREFERRED_VERSION_python-soappy ?= "0.11.6"
 PREFERRED_VERSION_python-spydi ?= "0.9.7"
@@ -1721,7 +1719,6 @@ PREFERRED_VERSION_sidplayer ?= "1.5.0"
 PREFERRED_VERSION_silo ?= "1.4.8"
 PREFERRED_VERSION_simh ?= "3.7-1"
 PREFERRED_VERSION_simpad-utilities ?= "1.0"
-PREFERRED_VERSION_sip-native ?= "4.7"
 PREFERRED_VERSION_sip3-native ?= "4.0.1"
 PREFERRED_VERSION_sipsak ?= "0.9.6"
 PREFERRED_VERSION_skippy-xd ?= "0.5.0"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 4e01298bf8..aff3ba90d1 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -151,6 +151,7 @@ FEED_ARCH_nslu2be 	= "armv5teb"
 # armv6
 
 FEED_ARCH_mx31ads 	= "armv6"
+FEED_ARCH_mx31moboard	= "armv6"
 FEED_ARCH_nokia800	= "armv6"  
 FEED_ARCH_omap2420h4	= "armv6"
 FEED_ARCH_omap2430sdp   = "armv6"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 87fea8d622..eb0a403fb3 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -39,6 +39,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 
 SRCREV_pn-openocd ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 8f82eb4611..cff6d7316b 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20071206"
+EFL_SRCDATE = "20080117"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}"
 SRCDATE_python-evas ?= "${EFL_SRCDATE}"
 SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
 SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-edbus ?= "${EFL_SRCDATE}"
 SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
 SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
 SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
@@ -106,7 +107,8 @@ SRCDATE_entice ?= "${EFL_SRCDATE}"
 SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
 SRCDATE_e-wm ?= "${EFL_SRCDATE}"
-SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_enna = "${EFL_SRCDATE}"
+#SRCDATE_enna ?= "${EFL_SRCDATE}"
 SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index af96ae435a..cdcf35d928 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -25,6 +25,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-gsm0710muxd ?= "42"
 SRCREV_pn-gypsy ?= "56"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-kismet ?= "2285"
@@ -42,8 +43,8 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "957"
-SRCREV_pn-linux-openmoko ?= "3238"
+SRCREV_pn-linux-ixp4xx ?= "983"
+SRCREV_pn-linux-openmoko ?= "3801"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -104,7 +105,7 @@ SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
 SRCREV_pn-openmoko-tasks2 ?= "361"
-SRCREV_pn-openmoko-terminal2 ?= "3542"
+SRCREV_pn-openmoko-terminal2 ?= "3764"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
 SRCREV_pn-openmoko-theme-standard2 ?= "3425"
@@ -112,12 +113,14 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "3609"
 SRCREV_pn-openmoko-today2-folders ?= "3414"
+SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-python-formencode = "3148"
+SRCREV_pn-python-gsmd = "127"
 SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index e3ddd2165b..dd6c2e0b7e 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -4,6 +4,7 @@
 #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
 #-----------------------------------------------------------------------------
 
+require conf/distro/include/preferred-om-2008-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc
 
 #
@@ -47,11 +48,8 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # Same kernel runs on both these machines
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
-# Same touchscreen on both these machines
-PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}"
-SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0"
-SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 928817d815..533b41526b 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -1,69 +1,84 @@
 #
-# Open Iomega distribution - based on openslug and generic confs
+# OpenProtium distribution - based upon openslug and generic confs
 # 
 DISTRO_NAME = "openprotium"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-DISTRO_TYPE = "alpha"
+DISTRO_VERSION = "1.3"
+DISTRO_TYPE ?= "alpha"
+TARGET_OS = "linux"
+#
+# Basic configuration
+#
+DISTRO_DEV_MANAGER = "udev"
+DISTRO_SSH_DAEMON = "dropbear"
+DISTRO_INIT_MANAGER = "sysvinit"
+DISTRO_LOGIN_MANAGER = "tinylogin"
+MACHINE_TASK_PROVIDER = "task-openprotium"
 
 #
 # Naming schemes
 #
-INHERIT += "debian"
+INHERIT += "debian multimachine"
 
 #
 # Packaging and output format
 #
 INHERIT += "package_ipk"
-IMAGE_BASENAME = "openprotium"
-IMAGE_FSTYPES = "jffs2"
-FEED_URIS = "openprotium##http://www.openprotium.org/ipkg.ppc.v1.0"
+IMAGE_FSTYPES = "jffs2 tar.gz"
+OPENPROTIUM_URI = "http://www.openprotium.org"
+FEED_ARCH_storcenter = ppc603e
+FEED_ARCH_turbostation = ppc603e
+FEED_URIS = "\
+	no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \
+	base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \
+	${MACHINE}##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${MACHINE} \
+	"
 
 # For protium on the turbostation
+IMAGE_BASENAME = "openprotium"
 IMAGE_BASENAME_turbostation = "openprotium-ts"
 
-#
-# binutils and compilers
-#
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-#conflict between this and the last below.
-#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# Select 2.6 versions of the depmod support
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
+# versions
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
 
-PREFERRED_VERSION_binutils = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
+PREFERRED_VERSION_gcc ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+PREFERRED_VERSION_glibc		     = "2.6.1"
+PREFERRED_VERSION_glibc-intermediate = "2.6.1"
+PREFERRED_VERSION_glibc-initial      = "2.6.1"
 
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
+PREFERRED_VERSION_linux-libc-headers = "2.6.11.1"
 
-# 
-# Target OS & FPU system
 #
-USE_NLS ?= "no"
-TARGET_OS = "linux"
-HOTPLUG = "udev"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
+# Providers...
 #
-# Bootstrap & Init
+# binutils and compilers
 #
-#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-linux-libc-initial = "glibc-initial"
+
+PREFERRED_PROVIDER_virtual/libc     = "glibc"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl  = "glibc"
+
+#silence a warning message...
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
 #
+# Misc items.
 #
-# Ensure consistency across all SlugOS builds for the provider of a
-# relational database - use the latest version of the SleepyCat
-# Berkeley database
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
+PREFERRED_PROVIDER_virtual/db 		?= "db"
+PREFERRED_PROVIDER_virtual/db-native 	?= "db-native"
+PREFERRED_PROVIDER_gconf 		?= "gconf"
 
-CMDLINE_DEBUG = "noirqdebug"
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
index fc760f9ea0..92e5ac5b39 100644
--- a/conf/distro/openwrt-sdk.conf
+++ b/conf/distro/openwrt-sdk.conf
@@ -18,9 +18,12 @@ require conf/distro/generic-uclibc.conf
 # Header
 #
 DISTRO_NAME = "OpenWRT"
+DISTRO_REVISION = "2"
+
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 
 # This is what lives in SDK
 ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Make sure that we have correct package dependencies for SDK-provided libs.
-ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
+ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf
new file mode 100644
index 0000000000..6cf2e05480
--- /dev/null
+++ b/conf/machine/chumby.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@Name: Chumby
+#@DESCRIPTION: Machine configuration for the Chumby
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+  kernel-modules \
+
+
+require conf/machine/include/tune-arm926ejs.inc
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "38400 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "22"
+
+IMAGE_FSTYPES += "cramfs"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c91bdcfc92..04e0e83051 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,24 +3,16 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
+require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
-# This is needed for the ramdisk script to work
-MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
-
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
 IMAGE_LINGUAS = ""
-
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.inc
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
-
-GUI_MACHINE_CLASS_poodle = "smallscreen"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index baa2e55dc1..ad0c64bef2 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -44,6 +44,3 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native"
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
 
-# set partition to flash kernel into
-MTD_KERNEL_PARTITION = "/dev/mtd2"
-
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 2b2d016089..bd9621413a 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -35,7 +35,11 @@ SERIAL_CONSOLE = "115200 ttySAC2"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
+  --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
+  --littleendian --pad \
+  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
@@ -46,6 +50,3 @@ include conf/machine/include/tune-arm920t.inc
 # build YAFFS2
 IMAGE_FSTYPES ?= "jffs2 yaffs2"
 
-# set partition to flash kernel into
-MTD_KERNEL_PARTITION = "/dev/mtd2"
-
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c037226154..6f0e37b803 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf
index 6bf89999bf..f7f025413d 100644
--- a/conf/machine/htcalpine.conf
+++ b/conf/machine/htcalpine.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf
index afaa6fc294..b3debb633c 100644
--- a/conf/machine/htcapache.conf
+++ b/conf/machine/htcapache.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index a5feeb2d69..f95cb70833 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat phone"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf
index 003406bd88..472e5d69e6 100644
--- a/conf/machine/htchimalaya.conf
+++ b/conf/machine/htchimalaya.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf
index a577cc78d2..2ae1419bae 100644
--- a/conf/machine/htcsable.conf
+++ b/conf/machine/htcsable.conf
@@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone"
 
 #
 # Software/packages selection
diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf
index 016247213d..b311afe1b4 100644
--- a/conf/machine/htctornado.conf
+++ b/conf/machine/htctornado.conf
@@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat phone"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..515700d9e6 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc
deleted file mode 100644
index bc80185fa0..0000000000
--- a/conf/machine/include/collie-2.6.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-SERIAL_CONSOLE = "115200 ttySA0"
-MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi vfat"
-
-MACHINE_EXTRA_RDEPENDS = "kernel-modules"
-
-MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
-
-zaurus_make_installkit () {
-    cd ${DEPLOY_DIR_IMAGE}
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-    mkdir ${IMAGE_NAME}-installkit/
-    # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
-    if [ "${MACHINE}" = "spitz" ]; then
-        cp gnu-tar ${IMAGE_NAME}-installkit/
-        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
-    else
-        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-    fi
-
-    # All zaurus machines except collie need updater.sh
-    if [ "${MACHINE}" != "collie" ]; then
-        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-    fi
-
-    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
-    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-}
-
-
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index bdf00d15c9..924fb54f1e 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
 
 # Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.7+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}"
 
 # Add packages required for basic networking support
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index 87571c0db0..da88b1494f 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -11,8 +11,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
 #mtd2: 00580000 00020000 "VFM_Filesystem"
 #mtd3: 00020000 00020000 "Logo"
 
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-MACHINE_FEATURES += "iwmmxt"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
+MACHINE_FEATURES += " iwmmxt"
 
 
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc
deleted file mode 100644
index fa24a3281b..0000000000
--- a/conf/machine/include/poodle-2.6.inc
+++ /dev/null
@@ -1 +0,0 @@
-require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index d84f1efb26..26d1e3f8ca 100644
--- a/conf/machine/include/qemu.inc
+++ b/conf/machine/include/qemu.inc
@@ -1,7 +1,6 @@
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
 
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/machine/include/tune-strongarm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
new file mode 100644
index 0000000000..f136710409
--- /dev/null
+++ b/conf/machine/include/tune-strongarm1100.inc
@@ -0,0 +1,5 @@
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 3f84138ac8..a0a71a2969 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -1,8 +1,9 @@
-# Zaurus Clamshell specific configuration for kernel 2.6
-# Don't forget to include zaurus-clamshell.inc as well
+# Zaurus specific configuration for kernel 2.6
+# Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
+PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,20 +11,15 @@ ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-
 IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
-
 EXTRA_IMAGEDEPENDS += "zaurus-updater"
 
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.inc
-
 SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
-
 PCMCIA_MANAGER ?= "pcmciautils"
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
@@ -49,7 +45,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/
 
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
 
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index f66502eff1..43c77d42da 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,3 +1,6 @@
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.inc
+
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 72fff1ed5e..a42dd8c127 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 8741eb4ff6..ee9117e406 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf
new file mode 100644
index 0000000000..c918404d6c
--- /dev/null
+++ b/conf/machine/mx31moboard.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: EPFL mx31MoBoard
+#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard
+#@Website: http://mobots.epfl.ch/mx31MoBoard.html
+
+TARGET_ARCH = "arm"
+TARGET_FPU_arm = "hard"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+#
+# usb networking
+#
+module_conf_g_ether = "alias usb0 g_ether"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+# to avoid annoying jffs2 messages
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000"
+
+IMAGE_FSTYPES += "tar.gz"
+
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 45fc16dc29..4e36c6d38a 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -12,6 +12,8 @@ XSERVER = "xserver-kdrive-xomap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf
index 58ddb25744..144df2ed08 100644
--- a/conf/machine/nokia800.conf
+++ b/conf/machine/nokia800.conf
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap"
 XSERVER = "xserver-kdrive-xomap"
 
 GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 TARGET_FPU = "hard"
 include conf/machine/include/tune-arm1136jf-s.inc
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..87c260856d 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 6334d34171..e187ee1e75 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 519c565061..5b69bbdc9a 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,23 +1,27 @@
 TARGET_ARCH = "powerpc"
-TARGET_OS = "linux"
 TARGET_FPU = "hard"
-PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-
-INHERIT += "storcenter-image"
+PACKAGE_EXTRA_ARCHS = "ppc603e"
 
 # terminal specs - console, but no other ports
-SERIAL_CONSOLE="115200 console"
+SERIAL_CONSOLE="115200 ttyS0"
 USE_VT="0"
 
-MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot"
+# uboot switches
+UBOOT_MACHINE="Sandpoint8240_config"
+
+# plug in other tasks - not "really" used unless we are using task-boot
+MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
+PREFERRED_VERSION_udev = "115"
 
-# We want udev support in the image
-udevdir = "/dev"
+# the StorCenter Control Daemon provides cmdline fan and light control
+MACHINE_EXTRA_RDEPENDS = "sccd"
 
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
+KERNEL_IMAGETYPE ?= uImage
+EXTRA_IMAGECMD_jffs2 += "--pad --big-endian --eraseblock=0x10000"
+# must be in HEX
+FLASH_KERNEL_SIZE=0x170000
+FLASH_ROOT_SIZE=0x590000
 
 require conf/machine/include/tune-ppc603e.inc