Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

18 files changed, 212 insertions, 139 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ffc84c666e..6f15ceb105 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2758,6 +2758,10 @@ sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2
 md5=54334e3d7af70846eb4916191e46081c
 sha256=056ec158ea09b6be8b9ea07f37d8b58f6dec28da6dcb33f789ce9b3f932eb7cd
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-gnome-1.8.tar.gz]
+md5=7f34a08e36aa77d4476d0919c52b59b6
+sha256=481b48f3cde1f896650195b75c25994df11eca05bb6e8d1951a46b603228811a
+
 [http://bluez.sourceforge.net/download/bluez-hcidump-1.26.tar.gz]
 md5=6eca8534fd6f0384d29f04198363f19c
 sha256=cd016375e9082268af224b26891cbea162fac5cf83a984f3e3988e6cee380a56
@@ -3034,6 +3038,10 @@ sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349
 md5=1e6cff57ac90d7ab984d9512fdd9f2dd
 sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349
 
+[http://downloads.sourceforge.net/bridge/bridge-utils-1.4.tar.gz]
+md5=0182fcac3a2b307113bbec34e5f1c673
+sha256=876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933
+
 [http://www.ludd.luth.se/~torger/files/brutefir-1.0i.tar.gz]
 md5=33fcf84a41d38f5aac24c57a66a2c3ee
 sha256=e0f3988afb0a84a89f38153fd5617615e9bcf32bb747ee981c99c44d3c4236f6
@@ -3990,6 +3998,10 @@ sha256=efa27532ec6dc12a21f703ad4a0f612e613e9cc2575147685db81cc701952ac9
 md5=cbb2b3d1718ee1237b808e00b5c11b1e
 sha256=813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05
 
+[ftp://ftp.gnu.org/gnu/coreutils/coreutils-7.2.tar.gz]
+md5=427c2914d3eab956f317c9ec6a45e62a
+sha256=dd77bfec92e5a3ad48abd8a5bda3f8d40149c4e24744e4173abc3cc6a731fdb2
+
 [http://www.rpsys.net/openzaurus/patches/archive/corgi_rearrange_lcd-r0.patch]
 md5=c1bec44c92f5da5abad97137c73b1365
 sha256=d4dc8f0583e616e74ea41b103d5f6a29b6d079ce37eaf9f362825514c7082490
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index e3e21872b7..8c5c4f7cb0 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43"
 PREFERRED_VERSION_inkwp ?= "0.1.1"
 PREFERRED_VERSION_inotify-tools ?= "2.1"
 PREFERRED_VERSION_inputproto ?= "1.4.4"
-PREFERRED_VERSION_install-native ?= "0.1"
 PREFERRED_VERSION_insttrain ?= "1.0.5"
 PREFERRED_VERSION_interbench ?= "0.30"
 PREFERRED_VERSION_intercom ?= "0.15"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 8c8de40f9d..992235a4b9 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -71,9 +71,3 @@ PREFERRED_VERSION_libusb			?= "0.0.0"
 
 # boost 1.36 won't build
 PREFERRED_VERSION_boost				?= "1.33.1"
-
-# We don't really care which openssl and openssl-native we get, but
-# the DEFAULT_PREFERENCE set in the recipes is such that if we don't
-# specify explicitly, we may get mismatched versions.
-PREFERRED_VERSION_openssl			?= "0.9.8j"
-PREFERRED_VERSION_openssl-native		?= "0.9.8j"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index af768c33da..8962174814 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -252,7 +252,7 @@ SRCREV_pn-webkit-gtk ?= "42127"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "8062d7aa7bac7e06c1a00bd88ca78098550606ed"
+SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b141548ce3..51ca9f34b1 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}
 # to enable/disable debugging in the distro.  Here noirqdebug is used to
 # remove the messages about unhandled interrupts - people debugging interrupt
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
-CMDLINE_ROOT  = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
+CMDLINE_ROOT  = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc"
 CMDLINE_DEBUG = "noirqdebug"
 
 # EXTRA PACKAGES
diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf
new file mode 100644
index 0000000000..82b78cbf79
--- /dev/null
+++ b/conf/distro/micro-uclibc.conf
@@ -0,0 +1,43 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro uclibc
+#@DESCRIPTION: Micro Linux Distribution (uclibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a Micro Linux distribution
+#@COMMENT: based on uclibc.
+#############################################################################
+
+# Based on the Micro Linux distribution
+require conf/distro/micro.conf
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+DISTRO_NAME = "micro-uclibc"
+
+#############################################################################
+# TARGET OS 
+#############################################################################
+# Use linux uclibc
+TARGET_OS = "linux-uclibc"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+PREFERRED_LIBC = "uclibc"
+
+#############################################################################
+# PREFERRED PROVIDERS 
+#############################################################################
+PREFERRED_PROVIDER_virtual/libc		= "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc	= "uclibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils	= "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers	= "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libintl	= "proxy-libintl"
+
+#############################################################################
+# PREFERRED VERSIONS 
+#############################################################################
+PREFERRED_VERSION_uclibc = "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
+
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
new file mode 100644
index 0000000000..bf4e5e1a82
--- /dev/null
+++ b/conf/distro/micro.conf
@@ -0,0 +1,100 @@
+#############################################################################
+#@TYPE: Distribution
+#@NAME: Micro
+#@DESCRIPTION: Micro Linux Distribution (glibc based)
+#@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
+#@COMMENT: This distribution configuration defines a truely tiny OE Linux  
+#@COMMENT: distribution. The matching buildable image target (micro-image)
+#@COMMENT: basically consists of: libc, busybox, udev, sysv init, and a few
+#@COMMENT: init scripts for running up the system.
+#############################################################################
+
+#############################################################################
+# DISTRO CONFIGURATION
+#############################################################################
+DISTRO_NAME = "micro"
+DISTRO_VERSION = "${SRCDATE}"
+
+#############################################################################
+# TARGET OS
+#############################################################################
+# Linux
+TARGET_OS = "linux"
+
+#############################################################################
+# DISTRO FEATURE SELECTION
+#############################################################################
+# No features selected
+DISTRO_FEATURES = ""
+
+#############################################################################
+# LIBRARY NAMES
+#############################################################################
+# Use Debian naming scheme for library (.so) files
+INHERIT += "debian"
+
+#############################################################################
+# PACKAGING & FEEDS
+#############################################################################
+# Select packaging system
+PREFERRED_PKG_FORMAT = "ipk"
+IPKG_VARIANT = "opkg-nogpg"
+
+require conf/distro/include/sane-feed.inc
+require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+#############################################################################
+# IMAGES
+#############################################################################
+# Name generated images
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\
+${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+
+CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}"
+DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+
+# Image output types
+IMAGE_FSTYPES ?= "tar.gz jffs2"
+
+#############################################################################
+# LINUX KERNEL SELECTION
+#############################################################################
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+#############################################################################
+# TOOLCHAIN
+#############################################################################
+PREFERRED_LIBC = "glibc"
+require conf/distro/include/sane-toolchain.inc
+
+#############################################################################
+# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS
+#############################################################################
+OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
+${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+#############################################################################
+# PREFERRED PROVIDERS
+#############################################################################
+PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
+PREFERRED_PROVIDER_virtual/libintl	= "glibc"
+
+#############################################################################
+# PREFERRED VERSIONS
+#############################################################################
+require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
+
+#############################################################################
+# NLS
+#############################################################################
+USE_NLS = "no"
+USE_NLS_glib-2.0 = "yes"
+USE_NLS_glib-2.0-native = "yes"
+USE_NLS_gcc-cross = "no"
+
+# Disable binary locale generation
+ENABLE_BINARY_LOCALE_GENERATION = "0"
+
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
deleted file mode 100644
index 5cb162524f..0000000000
--- a/conf/distro/unslung.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Unslung 
-#@DESCRIPTION: Unslung Linux Distribution for the NSLU2
-
-DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.11-beta"
-DISTRO_TYPE = "beta"
-
-FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
-FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable"
-FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable"
-
-TARGET_FPU = "soft"
-TARGET_OS = "linux"
-
-# select distro specific options to match that of the original LinkSys build
-ARM_INSTRUCTION_SET = "arm"
-THUMB_INTERWORK = "no"
-
-# for compatibility PACKAGE_ARCH stays as TARGET_ARCH and TARGET_ARCH is hard-wired
-# to armeb - this makes this stuff independent of changes in machine/nslu2.conf
-TARGET_ARCH = "armeb"
-PACKAGE_ARCH = "${TARGET_ARCH}"
-# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2be.conf).
-# We need "nslu2" added for backwards compatibility.
-PACKAGE_EXTRA_ARCHS += "nslu2"
-
-# match the optimisation settings to that which has traditionally been used
-# in unslung
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
-
-INHERIT += " package_ipk"
-
-IMAGE_FSTYPES = "jffs2"
-UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
-EXTRA_IMAGECMD_jffs2 = "-n --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"
-
-UNSLUNG_EXTRA_DEPENDS  ?= ""
-UNSLUNG_EXTRA_RDEPENDS ?= ""
-
-UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}"
-
-# Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-initial:glibc-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross"
-PREFERRED_PROVIDERS += " virtual/libc:glibc"
-PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers"
-
-PREFERRED_PROVIDER_libc6-unslung = "glibc"
-
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_glibc ?= "2.2.5"
-PREFERRED_VERSION_glibc-initial ?= "2.2.5"
-
-# Whilst gcc 3.4.4 sypports sysroot, binutils 2.15.94.0.1 does not
-# so we need the linkage helpers to help binutils find staging.
-DEPENDS_append_pn-linux-libc-headers = "cross-linkage staging-linkage"
-
-PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel"
-PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63"
-PREFERRED_VERSION_unslung-rootfs         ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
-PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
-
-CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
-INHERIT += "nslu2-mirrors"
-
-#-------------------------------------------------------------------
-#                           FIXME!
-# This is clearly wrong, the headers should match the 2.4.22 kernel,
-# but locking this to 2.6.11.1 at least gets Unslung building again.
-# - mwester 16 Dec 2006
-#
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 728ce4d9fe..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -8,10 +8,16 @@ require conf/machine/include/zaurus-clamshell.inc
 PACKAGE_EXTRA_ARCHS += "iwmmxt" 
 MACHINE_FEATURES += "iwmmxt"
 
-IMAGE_FSTYPES ?= "jffs2"
-
 # NAND factory-default
 # mtdparts=sharpsl-nand:7168k@0k(smf),59392k@7168k(root),-(home) 
 ROOT_FLASH_SIZE = "58"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 6a6c1b81a6..16073fee82 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -5,18 +5,24 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
-IMAGE_FSTYPES += "jffs2"
-
 # NAND factory-default
 # SL-C700 (corgi) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C750 (Shepherd) mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)
 # SL-C760 (Husky) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 # SL-C860 (Boxer) mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)
 
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
 ROOT_FLASH_SIZE = "25"
-# yes, we are aware that the husky and boxer (c760,c860) have 53MB rootfs,
-# but we don't make a special image for them.
 
 XSERVER = "xserver-kdrive-imageon"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "216"
+
 UBOOT_MACHINE = "corgi_config"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 6d09406375..96f430f377 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -25,7 +25,12 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-GUI_MACHINE_CLASS = "smallscreen"
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
 
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
+
 require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 71fea7a508..841b360f0d 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -22,20 +22,23 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+IMAGE_FSTYPES += "jffs2"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2"
 MACHINE_FEATURES_append_tosa  = " usbhost wifi "
 MACHINE_FEATURES_append_akita = " usbhost "
-MACHINE_FEATURES_append_spitz = " usbhost ext2 "
+MACHINE_FEATURES_append_spitz = " usbhost "
+
+MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical"
 
-MACHINE_EXTRA_RDEPENDS = "zaurusd"
+# Fixme ?
+#########
+# Here we just need snd modules
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
+MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
-GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_poodle = "smallscreen"
-
 KERNEL_IMAGE_MAXSIZE = "1294336"
 
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index c3bbca856a..34e803e418 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,11 +1,5 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT_c7x0 = "0xA0008000"
-UBOOT_ENTRYPOINT_akita = "0xA1000000"
-UBOOT_ENTRYPOINT_spitz = "0xA1000000"
-
-UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 5bddf09148..9bc92f1a99 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6"
 require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
-
-INHERIT += "nslu2-image"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 4ff36059a6..62e47cb678 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6"
 require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
-
-INHERIT += "nslu2-image"
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index 4e8f011a1e..db7a7809a7 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -5,6 +5,10 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES ?= "jffs2"
-
 ROOT_FLASH_SIZE = "22"
+
+MACHINE_GUI_CLASS = "smallscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "114"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 306046cfe8..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -6,24 +6,24 @@ require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/zaurus-clamshell.inc
 
 MACHINE_FEATURES += "iwmmxt"
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-
 PACKAGE_EXTRA_ARCHS += "iwmmxt"
-IMAGE_FSTYPES += "tar.gz"
 
 # NAND factory-default
 # SL-C3000 (spitz) mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)
 # SL-C3100 (borzoi) mtdparts=sharpsl-nand:7168k@0k(smf),32768k@7168k(root),-(home)
 # SL-C3200 (terrier) mtdparts=sharpsl-nand:7168k@0k(smf),44032k@7168k(root),-(home)
 
-# Valid size for all models, rootfs is on disk for these machines
-ROOT_FLASH_SIZE = "100"
+# There isn't an unique size valid for all models,
+# please set the right value in your local.conf
+ROOT_FLASH_SIZE ?= "5"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=270
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "640"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "270"
+MACHINE_DISPLAY_PPI = "216"
 
 # spitz and akita share same u-boot machine
 UBOOT_MACHINE = "akita_config"
+UBOOT_ENTRYPOINT = "0xA1000000"
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index 593ceab33d..87cfe4781a 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -5,15 +5,14 @@
 require conf/machine/include/zaurus-2.6.inc
 require conf/machine/include/tune-xscale.inc
 
-IMAGE_FSTYPES += "jffs2 tar.gz"
-
 # wlan-ng Modules
 # OHCI suspend/resume fixup
 MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb apm-tosa-suspendfix"
 
 ROOT_FLASH_SIZE = "28"
 
-MACHINE_GUI_CLASS=bigscreen
-MACHINE_DISPLAY_WIDTH_PIXELS=480
-MACHINE_DISPLAY_HEIGHT_PIXELS=640
-MACHINE_DISPLAY_ORIENTATION=0
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "200"