conf/machine: Drop older machines with no recent updates

These are all moving to meta-extras. Ideally in the future machines
such as these will be maintained to topic specific layers as we move
to a more layer oriented model. If this causes a problem for anyone
please discuss it on the mailing list.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

17 files changed, 0 insertions, 517 deletions

diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
deleted file mode 100644
index cdd465200c..0000000000
--- a/meta/conf/machine/akita.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C1000
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-
-require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
-
-MACHINE_FEATURES += "iwmmxt"
-
-IMAGE_FSTYPES ?= "jffs2"
-
-ROOT_FLASH_SIZE = "58"
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
deleted file mode 100644
index 2b2f1a4355..0000000000
--- a/meta/conf/machine/c7x0.conf
+++ /dev/null
@@ -1,14 +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
-
-require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
-
-IMAGE_FSTYPES ?= "jffs2"
-
-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.
-
-#XSERVER = "xserver-kdrive-imageon"
-
diff --git a/meta/conf/machine/cm-x270.conf b/meta/conf/machine/cm-x270.conf
deleted file mode 100644
index 9bf7d8f6ae..0000000000
--- a/meta/conf/machine/cm-x270.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#@TYPE: Machine
-#@Name: Compulab cm-x270
-#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
-#OLDEST_KERNEL = "2.6.16"
-TARGET_ARCH = "arm"
-GUI_MACHINE_CLASS ?= "bigscreen"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux ?= "2.6.23"
-
-
-require conf/machine/include/tune-xscale.inc
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
-
-# Console serial port. 
-# If you have a W module, add the following line to your local.conf:
-# the following line to your local.conf:
-CMX270_CONSOLE_SERIAL_PORT ?= "ttyS0"
-# the following is for the cm-x270 L module
-#CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
-
-# NAND flash eraseblock size
-# most of the older cm-x270 modules are populated with NAND flash
-# that have 128KiB eraseblocks.  Recently, a user encounted
-# a device that has 16KiB eraseblocks.  The following define
-# can be overridden in local.conf if you have one of these devices.
-CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000"
-
-
-# used by sysvinit_2 package, so rebuild this
-# package if you change the SERIAL_CONSOLE setting
-# the following is the port for the cm-x270 L module
-# I think the W module would use ttyS0, but has
-# not been tested.  This can be overwritten in 
-# local.conf
-SERIAL_CONSOLE ?= "38400 ${CMX270_CONSOLE_SERIAL_PORT}"
-
-# used by opie-collections.inc
-ROOT_FLASH_SIZE ?= "32"
-
-# for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SIZE} --pad --no-cleanmarkers;\
-	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-	-e ${CMX270_NAND_ERASEBLOCK_SIZE} -p; \
-	cd ${DEPLOY_DIR_IMAGE}; \
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
-	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
-	"
-
-MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia alsa iwmmxt"
-
-# to program the compulab NAND flash, the following scheme is suggested.  Create
-# a small rootfs that can fit in NOR flash using the following config:
-#   - Angstrom distro
-#   - uclibc (set ANGSTROM_MODE = "uclibc" in local.conf)
-#   - angstrom-minimal-image-with-mtd-utils bitbake target
-#   - put the following in your local.conf
-#     - IMAGE_FSTYPES = "jffs2 tar cpio.gz"
-# now, when you build the image, a cpio.gz will be generated
-# that can be used as an initramfs.  You can boot into this image and then
-# program the main rootfs jffs2 image in NAND flash using mtd-utils
-# you can select booting the initramfs, or the main nand rootfs by using
-# the "ramdisk on", or "ramdisk off" commands in the bootloader
-#
-
-
diff --git a/meta/conf/machine/depicture.conf b/meta/conf/machine/depicture.conf
deleted file mode 100644
index f72ab2939e..0000000000
--- a/meta/conf/machine/depicture.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#@TYPE: Machine
-#@NAME: Simtec BBD20EUROU + IM2440D20 (Combination known as: Depicture)
-#@DESCRIPTION: Machine configuration for running an ARM 920t in the BBD20EUROU board.
-
-TARGET_ARCH = "arm"
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/tune-arm920t.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-SERIAL_CONSOLE = "115200 ttySAC0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-simtec"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-fbdev"
-
-MACHINE_FEATURES = "kernel26 alsa usbhost"
-XSERVER = "xserver-kdrive-fbdev"
-
-SERIAL_CONSOLE = "115200 ttySAC0"
-
-# used by some images
-ROOT_FLASH_SIZE = "28"
-
-# Ensure the JFFS2 has summary nodes...
-IMAGE_FSTYPES += " jffs2"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
-  --no-cleanmarkers --pad -n -x lzo ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-  --littleendian --pad \
-  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/meta/conf/machine/em-x270.conf b/meta/conf/machine/em-x270.conf
deleted file mode 100644
index 9bcec5b742..0000000000
--- a/meta/conf/machine/em-x270.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-#@TYPE: Machine
-#@NAME: EM-X270
-#@DESCRIPTION: Machine configuration for the CompuLab EM-X270 with a pxa27x CPU
-
-#
-# Hardware-based properties
-#
-TARGET_ARCH = "arm"
-GUI_MACHINE_CLASS ?= "bigscreen"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-
-require conf/machine/include/tune-xscale.inc
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-# require conf/machine/include/tune-iwmmxt.inc
-
-IMAGE_DEPENDS_jffs2 += " genext2fs-native "
-ROOT_FLASH_SIZE = "128"
-IMAGE_CMD_jffs2 = " \
-          mkfs.jffs2 --root=${IMAGE_ROOTFS} \
-             --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-             --eraseblock=0x20000 --pad --faketime -n; \
-          sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-                  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-                  -e 0x20000 -p; \
-          mkdir -p ${WORKDIR}/img; \
-          mkdir -p ${WORKDIR}/kern-img/; \
-          install -m 0644 `readlink -f ${DEPLOY_DIR_IMAGE}/uImage-em-x270.bin` ${WORKDIR}/kern-img/uImage; \
-          mkfs.jffs2 --root=${WORKDIR}/kern-img/ --eraseblock=0x20000 --pad \
-	     --no-cleanmarkers --faketime --output=${WORKDIR}/img/em-x270-kernel.jffs2; \
-          cd ${DEPLOY_DIR_IMAGE}; \
-          ln -fs ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
-          install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
-                 ${WORKDIR}/img/em-x270-angstrom.jffs2; \
-          size=`du -sk ${WORKDIR}/img | cut -f 1` ; ((size *= 120)) ; ((size /= 100)) ; \
-          genext2fs -d ${WORKDIR}/img -b $size ${DEPLOY_DIR_IMAGE}/updater-em-x270.ext2 \
-"
-
-#VOLATILE_STORAGE_SIZE = "128"
-MACHINE_DISPLAY_WIDTH_PIXELS ?= "480"
-MACHINE_DISPLAY_HEIGHT_PIXELS ?= "640"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth wifi usbhost usbgadget screen phone "
-
-#
-# Software/packages selection
-#
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-#
-# Modules autoload and other boot properties
-#
-module_autoload_evdev = "evdev"
-module_autoload_mmc_block = "mmc_block"
-module_autoload_pxa27x_udc = "pxa27x_udc"
-
-#FIXME: this should be controlled by a userspace utility later.
-module_autoload_g_ether = "g_ether"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "a0008000"
diff --git a/meta/conf/machine/htcuniversal.conf b/meta/conf/machine/htcuniversal.conf
deleted file mode 100644
index 72f3bc4aad..0000000000
--- a/meta/conf/machine/htcuniversal.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: HTC Universal
-#@DESCRIPTION: Machine configuration for the HTC Universal smartphone
-
-#include conf/machine/include/tune-iwmmxt.inc
-include conf/machine/include/tune-xscale.inc
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
-
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen keyboard usbhost usbgadget wifi phone"
-
-MACHINE_EXTRA_RDEPENDS = "zaurusd"
-
-MACHINE_EXTRA_RRECOMMENDS = " \
-	kernel-module-htcuniversal-bt \
-	kernel-module-htcuniversal-phone \
-	kernel-module-i2c-pxa \
-	kernel-module-htcuniversal-acx \
-	kernel-module-acx \
-	kernel-module-usbserial \
-	"
-
-module_autoload_acx = "acx"
-module_autoload_htcuniversal_acx = "htcuniversal_acx"
-
-IMAGE_FSTYPES ?= "tar.gz"
-
-# Don't include kernels in standard images for Zaurus machines
-RDEPENDS_kernel-base = ""
-KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/hx2000.conf b/meta/conf/machine/hx2000.conf
deleted file mode 100644
index a6775f2c3a..0000000000
--- a/meta/conf/machine/hx2000.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-#@TYPE: Machine
-#@NAME: iPAQ hx2xxx
-#@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU 
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-
-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"
-
-IMAGE_FSTYPES ?= "jffs2 tar.bz2"
-
-MODUTILS = "26"	
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat"
-
-PCMCIA_MANAGER = "pcmciautils"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_GUI_CLASS = "smallscreen"
-MACHINE_DISPLAY_WIDTH_PIXELS = "240"
-MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-
-require conf/machine/include/tune-xscale.inc
-
-# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-#require conf/machine/include/tune-iwmmxt.inc
-
-module_autoload_evdev = "evdev"
-module_autoload_pcmcia = "pcmcia"
-module_autoload_mmc_block = "mmc_block"
-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"
-
-# Don't include kernels in standard images
-RDEPENDS_kernel-base = ""
-KERNEL_IMAGETYPE = "zImage"
diff --git a/meta/conf/machine/igep0020.conf b/meta/conf/machine/igep0020.conf
deleted file mode 100644
index 86adfcf1a0..0000000000
--- a/meta/conf/machine/igep0020.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-#@TYPE: Machine
-#@NAME: IGEP v2 machine
-#@DESCRIPTION: Machine configuration for the IGEP v2 board (http://www.myigep.com)
-TARGET_ARCH = "arm"
-
-# Floating point option
-TARGET_FPU_arm = "hard"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
-XSERVER = "xserver-xf86-lite \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-video-omapfb"
-
-
-# Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
-
-#Ship all kernel modules till the board support has matured enough
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules linux-firmware-sd8686"
-
-include conf/machine/include/tune-cortexa8.inc
-
-IMAGE_FSTYPES += "cpio ext3 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-
-# Guesswork
-SERIAL_CONSOLE = "115200 ttyS2"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-igep"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat wifi"
-
-# EXTRA_IMAGEDEPENDS += "u-boot x-load"
diff --git a/meta/conf/machine/igep0030.conf b/meta/conf/machine/igep0030.conf
deleted file mode 100644
index af36982a6a..0000000000
--- a/meta/conf/machine/igep0030.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-#@TYPE: Machine
-#@NAME: OMAP3 IGEP module
-#@DESCRIPTION: Machine configuration for the OMAP3 IGEP module (http://www.myigep.com)
-TARGET_ARCH = "arm"
-
-# Floating point option
-TARGET_FPU_arm = "hard"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
-XSERVER = "xserver-xf86-lite \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard \
-           xf86-video-omapfb"
-
-
-# Only has DVI connector for external screen
-GUI_MACHINE_CLASS = "bigscreen"
-
-#Ship all kernel modules till the board support has matured enough
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules linux-firmware-sd8686"
-
-include conf/machine/include/tune-cortexa8.inc
-
-IMAGE_FSTYPES += "cpio ext3 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-
-# Guesswork
-SERIAL_CONSOLE = "115200 ttyS2"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-igep"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat wifi"
-
-# EXTRA_IMAGEDEPENDS += "u-boot x-load"
diff --git a/meta/conf/machine/mx31ads.conf b/meta/conf/machine/mx31ads.conf
deleted file mode 100644
index 8b3e3dbc1a..0000000000
--- a/meta/conf/machine/mx31ads.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Freescale imx31 ADS Board
-#@DESCRIPTION: Machine configuration for the imx31 based Freescale ADS Board
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mx31"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen"
-
-IMAGE_FSTYPES ?= "tar.gz jffs2"
-SERIAL_CONSOLE = "-L 115200 ttymxc0"
-
-EXTRA_IMAGECMD_jffs2_mx31ads = "--pad --little-endian --eraseblock=0x20000 -n"
-
-require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/mx31phy.conf b/meta/conf/machine/mx31phy.conf
deleted file mode 100644
index eea673ab16..0000000000
--- a/meta/conf/machine/mx31phy.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#@TYPE: Machine
-#@NAME: Phytec phyCORE-iMX31 Board
-#@DESCRIPTION: Machine configuration for the imx31 based Phytec phyCORE-iMX31
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mx31"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen"
-
-IMAGE_FSTYPES ?= "tar.gz jffs2"
-KERNEL_IMAGETYPE = "uImage"
-UBOOT_ENTRYPOINT = "80008000"
-SERIAL_CONSOLE = "-L 115200 ttymxc0"
-EXTRA_IMAGECMD_jffs2_mx31phy = "--pad --little-endian --eraseblock=0x20000 -n"
-
-require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/omap-3430ldp.conf b/meta/conf/machine/omap-3430ldp.conf
deleted file mode 100644
index 759d58f015..0000000000
--- a/meta/conf/machine/omap-3430ldp.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: TI OMAP 3430 LDP
-#@DESCRIPTION: Machine configuration for the TI OMAP 3430 LDP (aka OMAP Zoom)
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth screen touchscreen phone"
-KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz jffs2"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-SERIAL_CONSOLE = "-L 115200 ttyS2"
-
-require conf/machine/include/tune-cortexa8.inc
-#require conf/machine/include/tune-arm1136jf-s.inc
-
-MACHINE_EXTRA_RRECOMMENDS = "\
-    kernel-module-ads7846 \
-    kernel-module-atkbd \
-    kernel-module-g-ether \
-    kernel-module-musb-hdrc \
-    kernel-module-omap24xxlib \
-    kernel-module-omap24xxvout \
-    kernel-module-omap-hsmmc \
-    kernel-module-snd-omap2-audio \
-    "
diff --git a/meta/conf/machine/omap-3430sdp.conf b/meta/conf/machine/omap-3430sdp.conf
deleted file mode 100644
index 651d6a9968..0000000000
--- a/meta/conf/machine/omap-3430sdp.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: TI OMAP 3430 SDP
-#@DESCRIPTION: Machine configuration for the TI OMAP 3430 SDP
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen"
-KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz jffs2"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-SERIAL_CONSOLE = "-L 115200 ttyS0"
-
-require conf/machine/include/tune-cortexa8.inc
-#require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/overo.conf b/meta/conf/machine/overo.conf
deleted file mode 100644
index 5271db627b..0000000000
--- a/meta/conf/machine/overo.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#@TYPE: Machine
-#@NAME: overo machine
-#@DESCRIPTION: Machine configuration for the overo
-
-include conf/machine/include/tune-cortexa8.inc
-
-TARGET_ARCH = "arm"
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa"
-
-PREFERRED_VERSION_u-boot = "git"
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap3"
-KERNEL_IMAGETYPE = "uImage"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-SERIAL_CONSOLE = "115200 ttyS2"
-
-IMAGE_FSTYPES += "tar.bz2 jffs2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-#XSERVER = "xserver-xorg \
-#           xf86-input-evdev \
-#           xf86-input-mouse \
-#           xf86-video-fbdev \
-#           xf86-input-keyboard"
-
-XSERVER = "xserver-kdrive-fbdev"
-
-GUI_MACHINE_CLASS = "bigscreen"
-
-ANGSTROM_URI = "http://www.gumstix.net"
-
-
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
deleted file mode 100644
index faa00e991f..0000000000
--- a/meta/conf/machine/spitz.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C3000
-#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-
-require conf/machine/include/zaurus-2.6.inc
-require conf/machine/include/zaurus-clamshell.inc
-
-MACHINE_FEATURES += "iwmmxt"
-
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
-
-IMAGE_FSTYPES ?= "tar.gz ext3"
-IMAGE_ROOTFS_SIZE_ext3 = "250000"
-
-ROOT_FLASH_SIZE = "100"
diff --git a/meta/conf/machine/zoom2.conf b/meta/conf/machine/zoom2.conf
deleted file mode 100644
index dec90c2c7b..0000000000
--- a/meta/conf/machine/zoom2.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-#@TYPE: Machine
-#@NAME: Logic PD Zoom2
-#@DESCRIPTION: Machine configuration for the OMAP3-powered Logic PD Zoom2
-TARGET_ARCH = "arm"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync"
-
-MACHINE_FEATURES = "kernel26 apm alsa usbgadget usbhost screen touchscreen"
-
-KERNEL_IMAGETYPE = "uImage"
-IMAGE_FSTYPES ?= "tar.gz jffs2 ext2"
-UBOOT_ENTRYPOINT ="0x80008000"
-UBOOT_LOADADDRESS ="0x80008000"
-
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-SERIAL_CONSOLE = "-L 115200 ttyS3"
-#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "u-boot x-load"
-
-require conf/machine/include/tune-cortexa8.inc
diff --git a/meta/conf/machine/zylonite.conf b/meta/conf/machine/zylonite.conf
deleted file mode 100644
index e82f041ff2..0000000000
--- a/meta/conf/machine/zylonite.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#@TYPE: Machine
-#@NAME: Marvel PXA3xx Monahans Zylonite
-#@DESCRIPTION: Machine configuration for the Zylonite Development board
-
-require conf/machine/include/tune-xscale.inc
-
-PACKAGE_EXTRA_ARCHS += "iwmmxt"
-
-TARGET_ARCH = "arm"
-
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo -p"
-
-IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
-                  mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
-                   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; "
-
-IMAGE_FSTYPES ?= "tar.bz2 jffs2"
-
-SERIAL_CONSOLE = "38400 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
-
-MACHINE_FEATURES = "kernel26 apm usbgadget"