Pull conf file updates from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@270 311d38ba-8fff-0310-9ca6-ca027cbcb966

29 files changed, 285 insertions, 44 deletions

diff --git a/openembedded/conf/machine/akita.conf b/openembedded/conf/machine/akita.conf
index cfcc411671..da699e7258 100644
--- a/openembedded/conf/machine/akita.conf
+++ b/openembedded/conf/machine/akita.conf
@@ -2,9 +2,9 @@
 #@NAME: Sharp Zaurus SL-C1000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-ROOT_FLASH_SIZE = "64"
+ROOT_FLASH_SIZE = "58"
diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf
index c5e42a2bed..af1c9dad1c 100644
--- a/openembedded/conf/machine/c7x0.conf
+++ b/openembedded/conf/machine/c7x0.conf
@@ -4,9 +4,8 @@
 
 KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
-
-ROOT_FLASH_SIZE = "32"
-# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
+ROOT_FLASH_SIZE = "25"
+# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/openembedded/conf/machine/handheld-common.conf b/openembedded/conf/machine/include/handheld-common.conf
index 4bb8325dea..467d5e59f1 100644
--- a/openembedded/conf/machine/handheld-common.conf
+++ b/openembedded/conf/machine/include/handheld-common.conf
@@ -16,9 +16,10 @@ irda irlan irnet irport irtty ircomm-tty \
 input uinput \
 "
 
+PCMCIA_MANAGER ?= "pcmcia-cs"
+
 # Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts"
-BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
 INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/ipaq-common.conf b/openembedded/conf/machine/include/ipaq-common.conf
index 791abd2103..eb696cf9f9 100644
--- a/openembedded/conf/machine/ipaq-common.conf
+++ b/openembedded/conf/machine/include/ipaq-common.conf
@@ -1,7 +1,5 @@
 IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
-BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
 BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
 
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf
new file mode 100644
index 0000000000..639bf4a74e
--- /dev/null
+++ b/openembedded/conf/machine/include/ixp4xx.conf
@@ -0,0 +1,174 @@
+#@TYPE: Machine configuration
+#@NAME: ixp4xx
+#@DESCRIPTION: genric machine configuration for ixp4xx platforms
+
+#-------------------------------------------------------------------------------
+# INPUTS
+#-------------------------------------------------------------------------------
+# conf/${DISTRO}.conf is included after this file and should be used to modify
+# variables identified as 'INPUTS' to the required values for the DISTRO, this
+# will cause the board specific settings (which depend for the most part on the
+# exact CPU used) to be set correctly within this file.  The results are the
+# variables identifies here as 'OUTPUTS'
+#
+#variable = "default"
+# <possible values>
+#    description
+
+ARCH_BYTE_SEX = "be"
+# "be" "le"
+#    The memory byte sex and (on correctly implemented hardware - the IXP4XX is
+#    correct) the byte sex of the buses within the system.  'be' (big-endian)
+#    means that the first byte is the most significant byte on a bus, 'le'
+#    (little-endian) means that the first byte is the least significant byte.
+
+ARM_INSTRUCTION_SET = "arm"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+DISTRO_BASE = ""
+# "" ":<base>"
+#    If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
+#    after ${DISTRO}, this allows different distros to share a common base of
+#    overrides.  The value given must include a leading ':' or chaos will result.
+
+IXP4XX_SUFFIX = "${MACHINE_ARCH}"
+# <string>
+#    Kernel suffix - 'ixp4xxbe' or 'ixp4xxle' for a truely generic image, controls
+#    the suffix on the name of the generated zImage, override in the DISTRO
+#    configuration if patches or defconfig are changed for the DISTRO.
+
+#-------------------------------------------------------------------------------
+# OUTPUTS
+#-------------------------------------------------------------------------------
+
+#OVERRIDES
+#    The standard ':' separated list of overrides used by bitbake - see the
+#    basic setting in bitbake.conf.  This list is based on that used for the
+#    standard setting however :<base>, :thumb and :thumb-interwork will be
+#    inserted at appropriate points if a base distro, default use of thumb or
+#    arm/thumb interworking are enabled in the inputs.
+OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}"
+
+# TARGET_CC_ARCH
+# TARGET_CC_KERNEL_ARCH
+# TARGET_LD_ARCH
+# TARGET_LD_KERNEL_ARCH
+#    Compiler and linker options for application code and kernel code.  These
+#    options ensure that the compiler has the correct settings for the selected
+#    instruction set and interworking.
+ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
+ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+#
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
+TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale -mno-thumb-interwork -mno-thumb"
+TARGET_LD_ARCH = ""
+TARGET_LD_KERNEL_ARCH = ""
+
+# FULL_OPTIMIZATION
+#    Optimization settings.  Os works fine and is significantly better than O2.
+#    The other settings are somewhat arbitrary.  The optimisations chosen here
+#    include the ones which 'break' symbolic debugging (because the compiler does
+#    not include enough information to allow the debugger to know where given
+#    values are.)  The -fno options are an attempt to cancel explicit use of space
+#    consuming options found in some packages (this isn't a complete list, this is
+#    just the ones which package writers seem to know about and abuse).
+FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
+        -fno-unroll-loops -fno-inline-functions \
+        -fweb -funit-at-a-time"
+
+# TARGET_ARCH
+#    The correct setting for the system endianness (ARCH_BYTE_SEX).  This will
+#    be arm (le) or armeb (be) - it is difficult to be more precise in the
+#    setting because of the large number of ways it is used within OpenEmbedded.
+TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
+
+# TARGET_PACKAGE_ARCH [not used]
+#    The correct setting for the generated packages.  This corresponds to the
+#    -march flag passed to the compiler because that limits the architectures
+#    on which the generated code will run.
+BYTE_SEX_CHAR = "${@['b', 'l'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
+TARGET_PACKAGE_ARCH_BASE = "${@['armv5te', 'thumbv5t'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}"
+
+# MACHINE_ARCH
+#    The correct setting for packages which are specific to the machine, this
+#    defaults to ${MACHINE} in bitbake.conf, however it is set to ixp4xx here
+#    because everything built here is no more specific than that.
+MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}"
+
+# IPKG_ARCHS
+#    The full list of package architectures which should run on the system.
+#    This takes into account both the board level issues and the INPUTS set
+#    by the distro.  The arm list is derived from the architecture settings
+#    known to gcc, the thumb list is then derived from that (only the 't'
+#    architectures of course).
+#[not used]: TARGET_ARCH is handled below because it is also currently
+# used for thumb packages.
+#ARM_ARCHITECTURES = "${TARGET_ARCH} armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
+ARM_ARCHITECTURES = "armv2${BYTE_SEX_CHAR} armv2a${BYTE_SEX_CHAR} armv3${BYTE_SEX_CHAR} armv3m${BYTE_SEX_CHAR} armv4${BYTE_SEX_CHAR} armv4t${BYTE_SEX_CHAR} armv5${BYTE_SEX_CHAR} armv5t${BYTE_SEX_CHAR} armv5e${BYTE_SEX_CHAR} armv5te${BYTE_SEX_CHAR} xscale${BYTE_SEX_CHAR}"
+THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t${BYTE_SEX_CHAR}"
+
+#    NOTE: this list contains just the things which rootfs_ipk.bbclass does
+#    not add, rootfs_ipk.bbclass evaluates:
+#
+#        ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}"
+#
+#    This is a priority ordered list - most desireable architecture at the end,
+#    so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if
+#    THUMB_INTERWORK precede this with the other architectures.
+IPKG_ARCHS = "ixp4xx ${MACHINE} \
+                ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \
+                (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \
+                + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \
+               (bb.data.getVar('THUMB_ARCHITECTURES', d, 1), \
+                bb.data.getVar('ARM_ARCHITECTURES', d, 1), \
+                bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'thumb', \
+                bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \
+                ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}"
+
+# IPKG_ARCH_LIST [not used]
+#    This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing
+#    the removal of the raw "${MACHINE}" from the end of the list.  ${MACHINE} and
+#    ixp4xx are included at the start (lower priority) as the non-byte-sex specific
+#    versions.
+IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}"
+
+#-------------------------------------------------------------------------------
+# Package versions
+#-------------------------------------------------------------------------------
+# Warning: these are shared across the different machine and distro
+# configurations but can be overridden therein if required.
+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"
+
+#-------------------------------------------------------------------------------
+# Board defaults
+#-------------------------------------------------------------------------------
+# These values are board specific but they seem to be common to a large number
+# of boards so are reasonable defaults.
+SERIAL_CONSOLE = "115200 ttyS0"
+KERNEL_CONSOLE = "ttyS0,115200n8"
+USE_VT = "0"
diff --git a/openembedded/conf/machine/include/poodle-2.4.conf b/openembedded/conf/machine/include/poodle-2.4.conf
new file mode 100644
index 0000000000..5453fda605
--- /dev/null
+++ b/openembedded/conf/machine/include/poodle-2.4.conf
@@ -0,0 +1,10 @@
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \
+kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor \
+hostap-utils prism3-firmware prism3-support"
+
diff --git a/openembedded/conf/machine/include/poodle-2.6.conf b/openembedded/conf/machine/include/poodle-2.6.conf
new file mode 100644
index 0000000000..885bf40b4f
--- /dev/null
+++ b/openembedded/conf/machine/include/poodle-2.6.conf
@@ -0,0 +1,4 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+
diff --git a/openembedded/conf/machine/include/thinclient-common.conf b/openembedded/conf/machine/include/thinclient-common.conf
new file mode 100644
index 0000000000..4a96b42525
--- /dev/null
+++ b/openembedded/conf/machine/include/thinclient-common.conf
@@ -0,0 +1,19 @@
+THINCLIENT_MODULES = "ipv6 \
+mip6-mn \
+tun \
+loop \
+vfat \
+sunrpc nfs \
+rfcomm bnep l2cap sco \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty \
+input uinput \
+"
+
+# Configuration bits for "generic thinclient"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "apm"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
+
+INHERIT += "linux_modules"
diff --git a/openembedded/conf/machine/include/tosa-2.4.conf b/openembedded/conf/machine/include/tosa-2.4.conf
new file mode 100644
index 0000000000..88df07cddb
--- /dev/null
+++ b/openembedded/conf/machine/include/tosa-2.4.conf
@@ -0,0 +1,20 @@
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \
+                                kernel-module-acm \
+                                kernel-module-evdev kernel-module-net-fd \
+                                kernel-module-pxa-bi kernel-module-registers \
+                                kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
+                                kernel hostap-modules-cs orinoco-modules-cs \
+                                sharp-sdmmc-support kernel-module-pxa-bi \
+                                kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \
+                                kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage"
+
+RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
+                                kernel-module-usbmouse kernel-module-hid usbutils \
+                                kernel-module-evdev"
+
diff --git a/openembedded/conf/machine/include/tosa-2.6.conf b/openembedded/conf/machine/include/tosa-2.6.conf
new file mode 100644
index 0000000000..fdd706d093
--- /dev/null
+++ b/openembedded/conf/machine/include/tosa-2.6.conf
@@ -0,0 +1,14 @@
+include conf/machine/include/zaurus-clamshell-2.6.conf
+# SOUND Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
+
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-pcm-oss ="snd-pcm-oss"
+
+# WM97xx Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
+module_autoload_wm9705 = "wm9705"
+#module_autoload_pxa-wm97xx = "pen_int=0"
+
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
+#module_autoload_wm97xx = "wm97xx"
diff --git a/openembedded/conf/machine/tune-arm920t.conf b/openembedded/conf/machine/include/tune-arm920t.conf
index 936b137517..936b137517 100644
--- a/openembedded/conf/machine/tune-arm920t.conf
+++ b/openembedded/conf/machine/include/tune-arm920t.conf
diff --git a/openembedded/conf/machine/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf
index 5e2f6b7c62..5e2f6b7c62 100644
--- a/openembedded/conf/machine/tune-arm926ejs.conf
+++ b/openembedded/conf/machine/include/tune-arm926ejs.conf
diff --git a/openembedded/conf/machine/tune-arm9tdmi.conf b/openembedded/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad1c1..cfc3bad1c1 100644
--- a/openembedded/conf/machine/tune-arm9tdmi.conf
+++ b/openembedded/conf/machine/include/tune-arm9tdmi.conf
diff --git a/openembedded/conf/machine/include/tune-c3.conf b/openembedded/conf/machine/include/tune-c3.conf
new file mode 100644
index 0000000000..e6a522af10
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-c3.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_ARCH = "i586"
+
diff --git a/openembedded/conf/machine/include/tune-ep9312.conf b/openembedded/conf/machine/include/tune-ep9312.conf
new file mode 100644
index 0000000000..f7a6fb845b
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ep9312.conf
@@ -0,0 +1,6 @@
+TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312"
+# add "-mfp=maverick" for newer gcc versions > 4.0
+
+#set arch to ep9312 for all generated packages
+PACKAGE_ARCH = "ep9312"
+
diff --git a/openembedded/conf/machine/include/tune-ppc603e.conf b/openembedded/conf/machine/include/tune-ppc603e.conf
new file mode 100644
index 0000000000..7c8714cfc2
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ppc603e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=603e"
+PACKAGE_ARCH = "ppc603e"
diff --git a/openembedded/conf/machine/include/tune-ppce500.conf b/openembedded/conf/machine/include/tune-ppce500.conf
new file mode 100644
index 0000000000..11717eba70
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-ppce500.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=8540"
+PACKAGE_ARCH = "ppce500"
diff --git a/openembedded/conf/machine/include/tune-sh3.conf b/openembedded/conf/machine/include/tune-sh3.conf
new file mode 100644
index 0000000000..192dd8fd22
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-sh3.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m3"
diff --git a/openembedded/conf/machine/include/tune-sh4.conf b/openembedded/conf/machine/include/tune-sh4.conf
new file mode 100644
index 0000000000..866f7f89d5
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-sh4.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m4"
diff --git a/openembedded/conf/machine/tune-strongarm.conf b/openembedded/conf/machine/include/tune-strongarm.conf
index 8654c996ef..8654c996ef 100644
--- a/openembedded/conf/machine/tune-strongarm.conf
+++ b/openembedded/conf/machine/include/tune-strongarm.conf
diff --git a/openembedded/conf/machine/include/tune-supersparc.conf b/openembedded/conf/machine/include/tune-supersparc.conf
new file mode 100644
index 0000000000..1b1ec1207f
--- /dev/null
+++ b/openembedded/conf/machine/include/tune-supersparc.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=supersparc"
+PACKAGE_ARCH = "supersparc" 
diff --git a/openembedded/conf/machine/tune-xscale.conf b/openembedded/conf/machine/include/tune-xscale.conf
index 0b98f09fc8..0b98f09fc8 100644
--- a/openembedded/conf/machine/tune-xscale.conf
+++ b/openembedded/conf/machine/include/tune-xscale.conf
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
index d61dc197b2..184258c8b6 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.4.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -9,10 +9,6 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
 # Later versions are broken on kernel 2.4
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
-BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
-wpa-supplicant-nossl ppp ppp-dialin openswan"
-
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
 pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
index 007750a39b..007750a39b 100644
--- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
diff --git a/openembedded/conf/machine/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
index f55f2d2554..ec10cd5e4e 100644
--- a/openembedded/conf/machine/zaurus-clamshell.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell.conf
@@ -4,22 +4,19 @@ IPKG_ARCHS = "all arm armv4 armv5te c7x0"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
+EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
                    --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
                    cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
                    ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
-BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
-
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
 GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
index 626b5cf218..0c432ad674 100644
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ b/openembedded/conf/machine/ipaq-pxa270.conf
@@ -9,9 +9,6 @@ PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
-BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
-BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools"
-
 ROOT_FLASH_SIZE = "80"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
@@ -23,15 +20,14 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-include conf/machine/ipaq-common.conf
-include conf/machine/handheld-common.conf
+include conf/machine/include/ipaq-common.conf
+include conf/machine/include/handheld-common.conf
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim" 
 GPE_EXTRA_INSTALL += "gaim"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+include conf/machine/include/tune-xscale.conf
 
 BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
index b3e1840469..82eff0b563 100644
--- a/openembedded/conf/machine/jornada7xx.conf
+++ b/openembedded/conf/machine/jornada7xx.conf
@@ -5,4 +5,4 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 
-include conf/machine/tune-strongarm.conf
\ No newline at end of file
+include conf/machine/include/tune-strongarm.conf
\ No newline at end of file
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 637b4311f4..d022d8703a 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -11,11 +11,10 @@ XSERVER = "xserver-kdrive-omap"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib"
 GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib"
 
 # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-arm926ejs.conf
+include conf/machine/include/tune-arm926ejs.conf
 
 
 #size of the root partition (yes, it is 123 MB)
@@ -30,11 +29,8 @@ SERIAL_CONSOLE = "115200 ttyS0"
 #build omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
-BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils  nokia770-init \
-apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
-
 BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
-apm  ppp wireless-tools console-tools"
+pcmcia-cs apm  ppp wireless-tools console-tools"
 
 # NFS Modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
@@ -56,5 +52,5 @@ apm  ppp wireless-tools console-tools"
 
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
-include conf/machine/handheld-common.conf
+include conf/machine/include/handheld-common.conf
 
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index 9a53e8f1a9..e1cb468d8f 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -2,19 +2,19 @@
 #@NAME: Sharp Zaurus SL-C3000
 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
 
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
 
-include conf/machine/zaurus-clamshell.conf
-include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+include conf/machine/include/zaurus-clamshell.conf
+include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-PIVOTBOOT_EXTRA_DEPENDS  += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
-BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
-BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "100"
+# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
+# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte