Rename /openembedded/ -> /meta/

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

20 files changed, 378 insertions, 0 deletions

diff --git a/meta/conf/machine/include/handheld-common.conf b/meta/conf/machine/include/handheld-common.conf
new file mode 100644
index 0000000000..f8767d2ddf
--- /dev/null
+++ b/meta/conf/machine/include/handheld-common.conf
@@ -0,0 +1,23 @@
+HANDHELD_MODULES = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+ide-cs ide-disk ide-probe-mod \
+loop \
+vfat ext2 \
+sunrpc nfs \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \
+pcnet-cs serial-cs airo-cs \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty ircomm-tty \
+input uinput \
+"
+
+# Configuration bits for "generic handheld"
+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/meta/conf/machine/include/ipaq-common.conf b/meta/conf/machine/include/ipaq-common.conf
new file mode 100644
index 0000000000..eb696cf9f9
--- /dev/null
+++ b/meta/conf/machine/include/ipaq-common.conf
@@ -0,0 +1,7 @@
+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_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf
new file mode 100644
index 0000000000..93befb92ce
--- /dev/null
+++ b/meta/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}:fail-fast"
+
+# 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_EXTRA_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_EXTRA_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_EXTRA_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_EXTRA_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/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf
new file mode 100644
index 0000000000..9076355522
--- /dev/null
+++ b/meta/conf/machine/include/poodle-2.6.conf
@@ -0,0 +1,43 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+                             kernel-module-g-serial kernel-module-g-ether"
+
+# Wireless Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
+                             hostap-conf orinoco-conf"
+
+# Sound Modules
+###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_SOUND     = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
+                             kernel-module-snd-pcm  \
+                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
+                             
+###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "
diff --git a/meta/conf/machine/include/thinclient-common.conf b/meta/conf/machine/include/thinclient-common.conf
new file mode 100644
index 0000000000..4a96b42525
--- /dev/null
+++ b/meta/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/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf
new file mode 100644
index 0000000000..c7805c36fe
--- /dev/null
+++ b/meta/conf/machine/include/tosa-2.6.conf
@@ -0,0 +1,6 @@
+include conf/machine/include/zaurus-clamshell-2.6.conf
+# wlan-ng Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
+
+# WM97xx Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf
new file mode 100644
index 0000000000..936b137517
--- /dev/null
+++ b/meta/conf/machine/include/tune-arm920t.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+
diff --git a/meta/conf/machine/include/tune-arm926ejs.conf b/meta/conf/machine/include/tune-arm926ejs.conf
new file mode 100644
index 0000000000..c1462ee148
--- /dev/null
+++ b/meta/conf/machine/include/tune-arm926ejs.conf
@@ -0,0 +1,6 @@
+#if gcc breaks change arm926ejs to arm926ej-s
+# For gcc 3.x you need:
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+# For gcc 4.x you need:
+#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
+PACKAGE_ARCH = "armv5te"
diff --git a/meta/conf/machine/include/tune-arm9tdmi.conf b/meta/conf/machine/include/tune-arm9tdmi.conf
new file mode 100644
index 0000000000..cfc3bad1c1
--- /dev/null
+++ b/meta/conf/machine/include/tune-arm9tdmi.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/meta/conf/machine/include/tune-c3.conf b/meta/conf/machine/include/tune-c3.conf
new file mode 100644
index 0000000000..e6a522af10
--- /dev/null
+++ b/meta/conf/machine/include/tune-c3.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_ARCH = "i586"
+
diff --git a/meta/conf/machine/include/tune-ep9312.conf b/meta/conf/machine/include/tune-ep9312.conf
new file mode 100644
index 0000000000..f7a6fb845b
--- /dev/null
+++ b/meta/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/meta/conf/machine/include/tune-ppc603e.conf b/meta/conf/machine/include/tune-ppc603e.conf
new file mode 100644
index 0000000000..7c8714cfc2
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppc603e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=603e"
+PACKAGE_ARCH = "ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce500.conf b/meta/conf/machine/include/tune-ppce500.conf
new file mode 100644
index 0000000000..11717eba70
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppce500.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=8540"
+PACKAGE_ARCH = "ppce500"
diff --git a/meta/conf/machine/include/tune-sh3.conf b/meta/conf/machine/include/tune-sh3.conf
new file mode 100644
index 0000000000..192dd8fd22
--- /dev/null
+++ b/meta/conf/machine/include/tune-sh3.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m3"
diff --git a/meta/conf/machine/include/tune-sh4.conf b/meta/conf/machine/include/tune-sh4.conf
new file mode 100644
index 0000000000..866f7f89d5
--- /dev/null
+++ b/meta/conf/machine/include/tune-sh4.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m4"
diff --git a/meta/conf/machine/include/tune-strongarm.conf b/meta/conf/machine/include/tune-strongarm.conf
new file mode 100644
index 0000000000..8654c996ef
--- /dev/null
+++ b/meta/conf/machine/include/tune-strongarm.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+
diff --git a/meta/conf/machine/include/tune-supersparc.conf b/meta/conf/machine/include/tune-supersparc.conf
new file mode 100644
index 0000000000..1b1ec1207f
--- /dev/null
+++ b/meta/conf/machine/include/tune-supersparc.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=supersparc"
+PACKAGE_ARCH = "supersparc" 
diff --git a/meta/conf/machine/include/tune-xscale.conf b/meta/conf/machine/include/tune-xscale.conf
new file mode 100644
index 0000000000..0b98f09fc8
--- /dev/null
+++ b/meta/conf/machine/include/tune-xscale.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "armv5te"
+
diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
new file mode 100644
index 0000000000..3c19ef3da6
--- /dev/null
+++ b/meta/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -0,0 +1,46 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_VERSION_wpa_supplicant = "0.4.7"
+
+PCMCIA_MANAGER ?= "pcmciautils"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
+
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \
+                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+
+# USB Gadget Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
+                             kernel-module-g-serial kernel-module-g-ether"
+
+# Wireless Modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
+                             kernel-module-hermes kernel-module-orinoco \
+                             kernel-module-orinoco-cs kernel-module-spectrum-cs \
+                             hostap-conf orinoco-conf"
+
+# Sound Modules
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-snd-soc-corgi "
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-snd-soc-spitz "
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-snd-soc-spitz "
+# For OSS
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
\ No newline at end of file
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf
new file mode 100644
index 0000000000..dfbbe5024e
--- /dev/null
+++ b/meta/conf/machine/include/zaurus-clamshell.conf
@@ -0,0 +1,29 @@
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
+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"
+
+# add a summary to the jffs2 file to make it mount a lot faster
+#EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+#                         -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \
+#                         --eraseblock=0x4000"
+#IMAGE_CMD_jffs2 +=     "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+#                        ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img"
+
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+include conf/machine/include/handheld-common.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"