merge of '3744a34d57095e84a89851df9f2cabc7b5a0dd0d'

     and 'bdbd61d03008d901627ae17450554a101ca42e5b'

17 files changed, 40 insertions, 345 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b80c2fc2ea..c8746d3576 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4607,8 +4607,8 @@ md5=03709c15cba0e0375ff5336d538f77e7
 sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
 
 [http://ftp.mozilla.org/pub/mozilla.org/js/older-packages/js-1.5.tar.gz]
-md5=7736c915a4949e7f6891f6c64a5ce495
-sha256=1faa36039d64e2ec24a02a58794fda237479111b55197450fe4710c73d0b44ba
+md5=863bb6462f4ce535399a7c6276ae6776
+sha256=ef72a154320c9949f8de0732e8dbfa186b83feb0a5e890d90807757de9998585
 
 [http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/1.0.7/source/thunderbird-1.0.7-source.tar.bz2]
 md5=e6388feb0ffcd189af779f165c124b4d
@@ -11914,10 +11914,6 @@ sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b
 md5=d168aa001b946b58d9aab6088c09d256
 sha256=4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4
 
-[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.2.0.tar.bz2]
-md5=ea291c89e68832d570d9d5e007218bd6
-sha256=e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
-
 [http://xournal.sourceforge.net/xournal-0.3.3.tar.gz]
 md5=c617d08d2c565eef0d8defb304925ade
 sha256=77f3bf12ce006eb06fc79d9c60a13ff69403ca6c28cc2babafb0ae35a2240ead
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0eebca25b1..daa579f132 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -131,7 +131,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.3"
 PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.2"
+PREFERRED_VERSION_cairo = "1.4.4"
 PREFERRED_VERSION_glib-2.0 = "2.12.11"
 
 # older gtk-webcore releases don't work on ARM/EABI
@@ -217,7 +217,7 @@ PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
 PREFERRED_VERSION_glibc ?= "2.5"
 
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf
deleted file mode 100644
index 2b0c745bde..0000000000
--- a/conf/distro/familiar-unstable.conf
+++ /dev/null
@@ -1 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"
diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf
deleted file mode 100644
index 2b0c745bde..0000000000
--- a/conf/distro/familiar.conf
+++ /dev/null
@@ -1 +0,0 @@
-WARNING:="${@bb.fatal('\n*\n*\n*    Sorry, the Familiar Linux support in OpenEmbedded is not up-to-date. \n     If you want to produce Familiar Linux compatible packages,\n     please use the Familiar Linux fork of OpenEmbedded.\n     Otherwise, using a DISTRO like \"angstrom-2007.1\" or \"generic\"\n     probably works well enough with your MACHINE configuration.\n*\n*\n')}"
diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc
deleted file mode 100644
index 4cf6fe1ead..0000000000
--- a/conf/distro/include/openzaurus.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenZaurus
-#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
-
-DISTRO = "openzaurus"
-DISTRO_NAME = "OpenZaurus"
-
-INHERIT += " package_ipk debian multimachine"
-# For some reason, this doesn't work
-# TARGET_OS ?= "linux"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "openzaurus-version"
-
-DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
-
-# Set minimal version of BitBake needed
-BB_MIN_VERSION = "1.4.4"
-INHERIT += "sanity"
-
-# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
-
-PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bc1a6fbfdd..4c7dd422c3 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.20"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
deleted file mode 100644
index 5819b5ad59..0000000000
--- a/conf/distro/openomap.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenOMAP
-#@DESCRIPTION: OE Distribution for TI OMAP Development Boards
-
-INHERIT += " package_ipk debian"
-TARGET_OS ?= "linux-gnueabi"
-TARGET_FPU ?= "soft"
-
-# 2.4 vs 2.6 is a distro decision.
-MODUTILS = "26"
-
-PREFERRED_PROVIDER_hotplug = "udev"
-
-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"
-
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-
-#EABI stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
-# use latest booting kernel but allow to override it in local.conf
-#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1"
-
-
-#use EABI toolchain
-PREFERRED_VERSION_gcc ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
-PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
-PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate ?= "2.5"
-
-#PREFERRED_VERSION_gcc ?= "4.1.1"
-#PREFERRED_VERSION_gcc-cross ?= "4.1.1"
-#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
-#PREFERRED_VERSION_binutils ?= "2.17"
-#PREFERRED_VERSION_binutils-cross ?= "2.17"
-#PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
-#PREFERRED_VERSION_glibc ?= "2.4"
-#PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs pcmcia usbhost alsa"
-
-PCMCIA_MANAGER = "pcmciautils"
-
diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf
deleted file mode 100644
index 42ae98fab1..0000000000
--- a/conf/distro/openzaurus-3.5.5.conf
+++ /dev/null
@@ -1,152 +0,0 @@
-#
-# This is config for last version of OpenZaurus distribution.
-# We (Hrw & XorA) decided to release 3.5.5 from .dev tree because .oz354x
-# is just too old so with such small devteam we are unable to backport all
-# needed fixes.
-#
-# This config need some love. It was created from current OpenZaurus config,
-# Ångström config and UmbaUmba 17.3 config.
-
-DISTRO_VERSION = "3.5.5-test0"
-
-TEST1 := "$bb.fatal('this config need love')"
-
-require conf/distro/include/openzaurus.inc
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Base
-#
-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"
-
-PREFERRED_VERSION_binutils-cross-sdk = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-
-# Glibc provides iconv and intl -- adjust, when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Feeds
-#
-# avoid "/" on end to avoid #1102
-FEED_BASE_URI = "http://feeds.openzaurus.org/3.5.5"
-
-FEED_URIS ?= " \
-        upgrades##${FEED_BASE_URI}/feed/upgrades \
-machine-upgrades##${FEED_BASE_URI}/feed/upgrades/machine/${MACHINE} \
-         machine##${FEED_BASE_URI}/feed/machine/${MACHINE} \
-            perl##${FEED_BASE_URI}/feed/perl \
-          python##${FEED_BASE_URI}/feed/python \
-            base##${FEED_BASE_URI}/feed/base "
-
-ENABLE_BINARY_LOCALE_GENERATION = "1"
-
-#
-# All machines will get 2.6 kernel (except collie of course)
-#
-MACHINE_KERNEL_VERSION = "2.6" 
-MACHINE_KERNEL_VERSION_collie = "2.4" 
-
-#
-# We use 2.6.20 kernel
-#
-PREFERRED_VERSION_linux-rp = "2.6.20"
-
-#
-# Toshiba USB Host driver is not updated so tosa == 2.6.17
-#
-PREFERRED_VERSION_linux-rp_tosa = "2.6.17"
-
-
-PREFERRED_VERSION_altboot = "1.0.8"
-
-# GPE
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-PREFERRED_PROVIDER_dbus-glib         = "dbus-glib"
-PREFERRED_PROVIDER_virtual/libsdl   ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine  ?= "libxine-x11"
-PREFERRED_PROVIDER_esound           ?= "pulseaudio"
-
-
-PREFERRED_VERSION_fontconfig        = "2.4.1"
-PREFERRED_VERSION_freetype          = "2.2.1"
-PREFERRED_VERSION_freetype-native   = "2.2.1"
-#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.12"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_xserver         = "xserver-kdrive"
-
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-
-#
-# 2.6.10 was used in previous release so will be compatible
-#
-PREFERRED_VERSION_gtk+ = "2.6.10"
-
-#zap extra stuff taking place in $MACHINE.conf 
-GPE_EXTRA_INSTALL = ""
-
-# Virtuals:
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-
-TEST2 := "$bb.fatal('this config need love')"
-
-# Others:
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-TEST4 := "$bb.fatal('this config need love')"
-PREFERRED_PROVIDER_ntp = "ntp"
-PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_libxss = "libxss"
-
-#
-# busybox 1.2.1 was known as working - feel free to update
-#
-PREFERRED_VERSION_busybox = "1.2.1"
-
-#
-# Die pcmcia-cs, DIE!
-#
-PCMCIA_MANAGER = "pcmciautils"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.71"
-
-PREFERRED_VERSION_gstreamer ?= "0.10.11"
-
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-
-PREFERRED_VERSION_wpa-supplicant = "0.5.7"
-PREFERRED_VERSION_hostap-utils ?= "0.4.7"
-PREFERRED_VERSION_hostap-modules ?= "0.4.7"
-
-PREFERRED_VERSION_gtk-engines ?= "2.6.5"
-
-#
-# We do not use qte-mt to keep compatibility with older OZ
-#
-PALMTOP_USE_MULTITHREADED_QT = "no"
-OPIE_VERSION = "1.2.2"
-
-require conf/distro/include/preferred-opie-versions.inc
-TEST3 := "$bb.fatal('this config need love')"
diff --git a/conf/distro/openzaurus-unstable-uclibc.conf b/conf/distro/openzaurus-unstable-uclibc.conf
deleted file mode 100644
index 28b740c3dd..0000000000
--- a/conf/distro/openzaurus-unstable-uclibc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-require conf/distro/include/openzaurus-unstable.inc
-
-TARGET_OS = "linux-uclibc"
-PREFERRED_PROVIDER_virtual/libiconv = "libiconv"
-PREFERRED_PROVIDER_virtual/libintl = "libintl"
-PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
-
-# NOTE: you have to rename your 2.95 gcc and 2.11.2 ld
-ASSUME_PROVIDED += "virtual/arm-linux-uclibc-gcc-2.95"
diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf
deleted file mode 100644
index 476249478d..0000000000
--- a/conf/distro/openzaurus-unstable.conf
+++ /dev/null
@@ -1,85 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: OpenZaurus <http://www.openzaurus.org>
-#@DESCRIPTION: A Linux Distribution for the Sharp Zaurus family
-#@--------------------------------------------------------------------
-
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-
-CVS_TARBALL_STASH = "\
-http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
-"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/openzaurus.inc
-
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-#FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060701"
-
-#
-# Zaurus
-#
-ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# Glibc provides iconv and intl -- adjust, when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-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"
-
-PREFERRED_VERSION_binutils-cross-sdk = "2.16"
-PREFERRED_VERSION_binutils-cross = "2.16"
-PREFERRED_VERSION_binutils = "2.16"
-
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
-
-PREFERRED_VERSION_wpa-supplicant = "0.5.5"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index d116c15ae6..aaf5c690a8 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -45,6 +45,7 @@ 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"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+PREFERRED_PROVIDERS += " virtual/libc:glibc"
 
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
@@ -61,17 +62,9 @@ PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
 
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
 
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
 #-------------------------------------------------------------------
 #                           FIXME!
 # This is clearly wrong, the headers should match the 2.4.22 kernel,
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c9cfe7744f..429463cc87 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-MACHINE_KERNEL_VERSION ?= "2.4"
+MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
diff --git a/conf/machine/include/tune-ppc440.conf b/conf/machine/include/tune-ppc440.conf
new file mode 100644
index 0000000000..dff8dce684
--- /dev/null
+++ b/conf/machine/include/tune-ppc440.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf
index 6f963d164e..000b200840 100644
--- a/conf/machine/mtx-3a.conf
+++ b/conf/machine/mtx-3a.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the mtx-3a 
 
 TARGET_ARCH = "arm"
-#PACKAGE_ARCHS = "all arm ${MACHINE}"
+PACKAGE_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 TARGET_CC_ARCH = "-march=armv5te"
diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf
index 07976f7dbd..55a29186e3 100644
--- a/conf/machine/mx31ads.conf
+++ b/conf/machine/mx31ads.conf
@@ -19,3 +19,6 @@ SERIAL_CONSOLE = "115200 ttymxc0"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
+
+IMAGE_FSTYPES += "tar.gz"
+
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 71eac0d6c5..7c293d9ebf 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -13,7 +13,7 @@ OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci pcmcia screen alsa irda acpi screen touchscreen"
 
 IMAGE_FSTYPES = "tar.gz"
 
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
new file mode 100644
index 0000000000..b2d0f3593e
--- /dev/null
+++ b/conf/machine/sequoia.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@Name: AMCC Sequoia Development Platform
+#@DESCRIPTION: Machine configuration for the AMCC Sequoia development platform http://www.amcc.com/Embedded/Downloads/440EPx/
+
+
+TARGET_ARCH = "powerpc"
+PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+
+MACHINE_FEATURES = "kernel26 usbhost"
+MACHINE_TASK_PROVIDER = "task-base"
+
+#don't try to access tty1
+USE_VT = "0"
+
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_VERSION_u-boot = "1.1.2"
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x10000"
+IMAGE_FSTYPES = "jffs2"
+
+#tune for the AMCC440 cpu
+require conf/machine/include/tune-ppc440.conf