Rename /openembedded/ -> /meta/

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

28 files changed, 0 insertions, 614 deletions

diff --git a/openembedded/conf/machine/akita.conf b/openembedded/conf/machine/akita.conf
deleted file mode 100644
index 89c0d031e..000000000
--- a/openembedded/conf/machine/akita.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C1000
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-
-include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
-
-ROOT_FLASH_SIZE = "58"
diff --git a/openembedded/conf/machine/c7x0.conf b/openembedded/conf/machine/c7x0.conf
deleted file mode 100644
index 0bd962352..000000000
--- a/openembedded/conf/machine/c7x0.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C7x0
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-
-include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.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/cmx270.conf b/openembedded/conf/machine/cmx270.conf
deleted file mode 100644
index fc281f374..000000000
--- a/openembedded/conf/machine/cmx270.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#@TYPE: Machine
-#@NAME: Nokia 770 internet tablet
-#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
-TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
-
-IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
-                  mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; "
-
-PREFERRED_PROVIDER_virtual/bootloader = ""
-
-# 800x480 is big enough for me
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-#size of the root partition (yes, it is 123 MB)
-ROOT_FLASH_SIZE = "128"
-
-# serial console port on devboard rev. B3
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-cmx270"
-
-
-include conf/machine/include/handheld-common.conf
-
diff --git a/openembedded/conf/machine/include/handheld-common.conf b/openembedded/conf/machine/include/handheld-common.conf
deleted file mode 100644
index f8767d2dd..000000000
--- a/openembedded/conf/machine/include/handheld-common.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-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/openembedded/conf/machine/include/ipaq-common.conf b/openembedded/conf/machine/include/ipaq-common.conf
deleted file mode 100644
index eb696cf9f..000000000
--- a/openembedded/conf/machine/include/ipaq-common.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-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/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf
deleted file mode 100644
index 93befb92c..000000000
--- a/openembedded/conf/machine/include/ixp4xx.conf
+++ /dev/null
@@ -1,174 +0,0 @@
-#@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/openembedded/conf/machine/include/poodle-2.6.conf b/openembedded/conf/machine/include/poodle-2.6.conf
deleted file mode 100644
index 907635552..000000000
--- a/openembedded/conf/machine/include/poodle-2.6.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-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/openembedded/conf/machine/include/thinclient-common.conf b/openembedded/conf/machine/include/thinclient-common.conf
deleted file mode 100644
index 4a96b4252..000000000
--- a/openembedded/conf/machine/include/thinclient-common.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-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.6.conf b/openembedded/conf/machine/include/tosa-2.6.conf
deleted file mode 100644
index c7805c36f..000000000
--- a/openembedded/conf/machine/include/tosa-2.6.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-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/openembedded/conf/machine/include/tune-arm920t.conf b/openembedded/conf/machine/include/tune-arm920t.conf
deleted file mode 100644
index 936b13751..000000000
--- a/openembedded/conf/machine/include/tune-arm920t.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
-
diff --git a/openembedded/conf/machine/include/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf
deleted file mode 100644
index c1462ee14..000000000
--- a/openembedded/conf/machine/include/tune-arm926ejs.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#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/openembedded/conf/machine/include/tune-arm9tdmi.conf b/openembedded/conf/machine/include/tune-arm9tdmi.conf
deleted file mode 100644
index cfc3bad1c..000000000
--- a/openembedded/conf/machine/include/tune-arm9tdmi.conf
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/openembedded/conf/machine/include/tune-c3.conf b/openembedded/conf/machine/include/tune-c3.conf
deleted file mode 100644
index e6a522af1..000000000
--- a/openembedded/conf/machine/include/tune-c3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f7a6fb845..000000000
--- a/openembedded/conf/machine/include/tune-ep9312.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 7c8714cfc..000000000
--- a/openembedded/conf/machine/include/tune-ppc603e.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 11717eba7..000000000
--- a/openembedded/conf/machine/include/tune-ppce500.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 192dd8fd2..000000000
--- a/openembedded/conf/machine/include/tune-sh3.conf
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_CC_ARCH = "-ml -m3"
diff --git a/openembedded/conf/machine/include/tune-sh4.conf b/openembedded/conf/machine/include/tune-sh4.conf
deleted file mode 100644
index 866f7f89d..000000000
--- a/openembedded/conf/machine/include/tune-sh4.conf
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_CC_ARCH = "-ml -m4"
diff --git a/openembedded/conf/machine/include/tune-strongarm.conf b/openembedded/conf/machine/include/tune-strongarm.conf
deleted file mode 100644
index 8654c996e..000000000
--- a/openembedded/conf/machine/include/tune-strongarm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/openembedded/conf/machine/include/tune-supersparc.conf b/openembedded/conf/machine/include/tune-supersparc.conf
deleted file mode 100644
index 1b1ec1207..000000000
--- a/openembedded/conf/machine/include/tune-supersparc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-mcpu=supersparc"
-PACKAGE_ARCH = "supersparc" 
diff --git a/openembedded/conf/machine/include/tune-xscale.conf b/openembedded/conf/machine/include/tune-xscale.conf
deleted file mode 100644
index 0b98f09fc..000000000
--- a/openembedded/conf/machine/include/tune-xscale.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
-PACKAGE_ARCH = "armv5te"
-
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
deleted file mode 100644
index 3c19ef3da..000000000
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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/openembedded/conf/machine/include/zaurus-clamshell.conf b/openembedded/conf/machine/include/zaurus-clamshell.conf
deleted file mode 100644
index dfbbe5024..000000000
--- a/openembedded/conf/machine/include/zaurus-clamshell.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-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"
diff --git a/openembedded/conf/machine/ipaq-pxa270.conf b/openembedded/conf/machine/ipaq-pxa270.conf
deleted file mode 100644
index f5cc893c9..000000000
--- a/openembedded/conf/machine/ipaq-pxa270.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-#@TYPE: Machine
-#@NAME: iPAQ hx47xx hx2xxx
-#@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU  devices
-
-TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700"
-#use this for a hx47xx ipaq
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
-
-#use this for a hx2xxx ipaq
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-
-PREFERRED_VERSION_orinoco-modules = "0.15rc1"
-
-ROOT_FLASH_SIZE = "80"
-
-EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-			  -e 256KiB -p"
-
-MODUTILS = "26"	
-PCMCIA_MANAGER = "pcmciautils"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
-BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
-
-PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
-		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
-		  nls_cp437 nls_iso8859-1 nls_utf8 af_key"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-include conf/machine/include/handheld-common.conf
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/include/tune-xscale.conf
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#include conf/machine/include/tune-iwmmxt.conf
-
-BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
-HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
-                  hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
-
-
-module_autoload_evdev = "evdev"
-module_autoload_hx4700_power = "hx4700_power"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
-module_autoload_asic3_mmc = "asic3_mmc"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_hx4700_ts = "hx4700_ts"
-module_autoload_hx4700_navpt = "hx4700_navpt"
-module_autoload_hx4700_bt = "hx4700_bt"
-module_autoload_snd-hx4700_audio = "snd-hx4700_audio"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
-module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_pxa27x_udc = "pxa27x_udc"
-
-#FIXME: this should be controlled by a userspace utility later.
-module_autoload_g_ether = "g_ether"
diff --git a/openembedded/conf/machine/jornada7xx.conf b/openembedded/conf/machine/jornada7xx.conf
deleted file mode 100644
index e8218138d..000000000
--- a/openembedded/conf/machine/jornada7xx.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: HP Jornada 7xx 
-#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
-
-TARGET_ARCH = "arm"
-
-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
deleted file mode 100644
index bf893660d..000000000
--- a/openembedded/conf/machine/nokia770.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#@TYPE: Machine
-#@NAME: Nokia 770 internet tablet
-#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
-TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
-PREFERRED_PROVIDER_virtual/bootloader = ""
-PREFERRED_PROVIDER_tslib = "tslib-maemo"
-
-XSERVER = "xserver-kdrive-omap"
-
-# 800x480 is big enough for me
-GUI_MACHINE_CLASS = "bigscreen"
-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/include/tune-arm926ejs.conf
-
-
-#size of the root partition (yes, it is 123 MB)
-ROOT_FLASH_SIZE = "123"
-EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
-
-# serial console port on devboard rev. B3
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-nokia770"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
-${PCMCIA_MANAGER} apm  ppp wireless-tools console-tools"
-
-# 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 "
-# 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"
-# PPP Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
-
-#USB Gadget Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
-#							 kernel-module-g-ether"
-
-ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
-
-include conf/machine/include/handheld-common.conf
-
diff --git a/openembedded/conf/machine/qemuarm.conf b/openembedded/conf/machine/qemuarm.conf
deleted file mode 100644
index 3341efd1a..000000000
--- a/openembedded/conf/machine/qemuarm.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-#@TYPE: Machine
-#@NAME: qemu ARM Emulator setup
-#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
-
-TARGET_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4 armv5te"
-
-PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/include/handheld-common.conf
-include conf/machine/include/tune-arm926ejs.conf
-
-SERIAL_CONSOLE = "115200 ttyAMA0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
-ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
-
-# 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-irda kernel-module-ircomm \
-#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
-
-IMAGE_FSTYPES = "tar.bz2"
-
-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
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
deleted file mode 100644
index f78dd7a3b..000000000
--- a/openembedded/conf/machine/spitz.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C3000
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-
-include conf/machine/include/zaurus-clamshell.conf
-include conf/machine/include/zaurus-clamshell-2.6.conf
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-PIVOTBOOT_EXTRA_RRECOMMENDS += ""
-
-# Useful things for the built-in Harddisk
-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