24 files changed, 350 insertions, 42 deletions
diff --git a/conf/machine/archos5.conf b/conf/machine/archos5.conf
index 8640912b0f..e4fdc95545 100644
--- a/conf/machine/archos5.conf
+++ b/conf/machine/archos5.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: OMAP3 based Archos 5
-#@DESCRIPTION: Machine configuration for the Archos 5
+#@DESCRIPTION: Machine configuration for the Archos 5 (Gen6)
 
 TARGET_ARCH = "arm"
 require conf/machine/include/omap3.inc
@@ -35,7 +35,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS2"
 
-CMDLINE = "root=/dev/sda1 rw init=/sbin/init console=ttyS2,115200n8 mem=128M nohz=off"
+CMDLINE = "root=/dev/sda1 rw init=/sbin/init console=ttyS2,115200n8 mem=128M nohz=off omapfb.vram=3686400"
 
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen wifi"
 
diff --git a/conf/machine/archos5it.conf b/conf/machine/archos5it.conf
new file mode 100644
index 0000000000..0a1989a5e3
--- /dev/null
+++ b/conf/machine/archos5it.conf
@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: OMAP3 based Archos 5 IT
+#@DESCRIPTION: Machine configuration for the Archos 5 IT (Gen7)
+
+TARGET_ARCH = "arm"
+require conf/machine/include/omap3.inc
+
+ASSUME_PROVIDED += "u-boot"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-tslib \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+#What is the correct one, both seem in use?
+MACHINE_GUI_CLASS = "bigscreen"
+GUI_MACHINE_CLASS = "bigscreen"
+
+#800 * 480 Widescreen
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+
+KERNEL_IMAGETYPE = "zImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-archos"
+
+# Ship all kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+IMAGE_FSTYPES += "tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+CMDLINE = "root=/dev/sda1 rw init=/sbin/init console=ttyS2,115200n8 mem=256M nohz=off omapfb.vram=3686400 extrabaud=1000000"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard vfat ext2 screen touchscreen wifi"
+
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index d79cf15129..e45629d191 100644
--- a/conf/machine/bug.conf
+++ b/conf/machine/bug.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the BUG base unit.
 TARGET_ARCH = "arm"
 
-MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw"
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw kernel-modules"
 PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
 
 MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"
@@ -15,6 +15,9 @@ require conf/machine/include/tune-arm1136jf-s.inc
 
 KERNEL_IMAGETYPE = "uImage"
 
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
diff --git a/conf/machine/bug20.conf b/conf/machine/bug20.conf
new file mode 100644
index 0000000000..dbc1faf6ea
--- /dev/null
+++ b/conf/machine/bug20.conf
@@ -0,0 +1,47 @@
+#@TYPE: Machine
+#@NAME: BUG 2.0
+#@DESCRIPTION: Machine configuration for the BUG 2.0 board (OMAP3530 based)
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xserver-xorg-extension-dri \
+           xserver-xorg-extension-glx \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+# this kernel is not provided in OE yet
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-hah"
+
+IMAGE_FSTYPES += "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttyS2"
+
+UBOOT_MACHINE = "omap3_bug_config"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+PREFERRED_VERSION_u-boot = "git"
+
+# and sdio
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/ea3250.conf b/conf/machine/ea3250.conf
new file mode 100644
index 0000000000..50099a2c4b
--- /dev/null
+++ b/conf/machine/ea3250.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: Embedded Artists LPC3250 machine
+#@DESCRIPTION: Machine configuration for Embedded Artists LPC3250 development board
+#@WEBSITE: http://www.embeddedartists.com/products/kits/lpc3250_kit.php
+
+TARGET_ARCH = "arm"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+MACHINE_KERNEL_PR		= "r0"
+
+MACHINE_FEATURES 		= "kernel26 usbhost ext2 vfat"
+MACHINE_TASK_PROVIDER 		= "task-base"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-ea3250"
+PREFERRED_VERSION_linux-ea3250 = "2.6.27.8"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+SERIAL_CONSOLE = "ttyS0 115200"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
diff --git a/conf/machine/eee701.conf b/conf/machine/eee701.conf
index 0c4b965655..b08ac6f2d7 100644
--- a/conf/machine/eee701.conf
+++ b/conf/machine/eee701.conf
@@ -6,20 +6,21 @@
 
 require i686-generic.conf
 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-MACHINE_DRI_MODULES ?= "i915"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
+MACHINE_DRI_MODULES = "i915"
 
 MACHINE_FEATURES +=" wifi alsa "
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_DISPLAY_ORIENTATION = "0"
-XSERVER ?= "xserver-xorg \
+XSERVER = "xserver-xorg \
            xf86-video-intel \
            xf86-input-evdev \
-	   xf86-input-keyboard \
-	   xf86-input-mouse \
-	   xf86-input-synaptics"
+           xf86-input-keyboard \
+           xf86-input-mouse \
+           xf86-input-synaptics \
+           "
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
index ae53a53377..7251de70c1 100644
--- a/conf/machine/hawkboard.conf
+++ b/conf/machine/hawkboard.conf
@@ -11,4 +11,19 @@ UBOOT_LOADADDRESS = "0xc0008000"
 
 MACHINE_FEATURES = "kernel26 serial ethernet ide screen"
 
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 960 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 960"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
 SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf
new file mode 100644
index 0000000000..06a4fbf61a
--- /dev/null
+++ b/conf/machine/imote2.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@Name: Crossbow iMote2
+#@DESCRIPTION: Machine configuration for Crossbow iMote 2
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PACKAGE_EXTRA_ARCHS = " iwmmxt"
+
+require conf/machine/include/tune-xscale.inc
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE ?= "32"
+
+MACHINE_FEATURES = "kernel26 usbgadget alsa iwmmxt"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index a262059d45..2d744e9897 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r32"
+MACHINE_KERNEL_PR = "r34"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
index 6ee1ddc3fa..bc9cd518e2 100644
--- a/conf/machine/include/initramfs-kexecboot.inc
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -1,13 +1,18 @@
-# initramfs-kexecboot specific config options
+# Initramfs-kexecboot extra config
 
-MACHINE_FEATURES_append = " kexecboot "
 
+# If set here, each image will also build linux-kexecboot.
+# Usually the machine-installer recipe already DEPENDS on it
+#
 EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
-# Include kernel image in kexecboot enabled images
-RDEPENDS_kernel-base = "kernel-image" 
 
-# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels
-DONT_CHECK_KERNELSIZE ?= "1"
+# Force inclusion of kernel in target images
+# (done by default)
+#
+RDEPENDS_kernel-base = "kernel-image"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
+
+# Install /boot/boot.cfg in target images
+#
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 8507857b11..632540345b 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r16"
+MACHINE_KERNEL_PR = "r18"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/tune-ppc440.inc b/conf/machine/include/tune-ppc440.inc
index feca186315..1c94a34e9e 100644
--- a/conf/machine/include/tune-ppc440.inc
+++ b/conf/machine/include/tune-ppc440.inc
@@ -1,4 +1,4 @@
 TARGET_CC_ARCH = "-mcpu=440"
 BASE_PACKAGE_ARCH = "ppc440"
 FEED_ARCH = "ppc440"
-PACKAGE_EXTRA_ARCHS += "ppc440e"
+PACKAGE_EXTRA_ARCHS += "${BASE_PACKAGE_ARCH} ppc440e"
diff --git a/conf/machine/include/tune-ppce600.inc b/conf/machine/include/tune-ppce600.inc
new file mode 100644
index 0000000000..77a7cb86b8
--- /dev/null
+++ b/conf/machine/include/tune-ppce600.inc
@@ -0,0 +1,4 @@
+TARGET_CC_ARCH = "-mcpu=7450"
+BASE_PACKAGE_ARCH = "ppce600"
+FEED_ARCH = "ppce600"
+PACKAGE_EXTRA_ARCHS += "ppce600"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 1ba4a3422d..bbbb38315c 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -4,13 +4,12 @@ MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
-# Starting with 2.6.32 linux-rp is deprecated
+# Starting with 2.6.32 linux-rp is deprecated for some models
 #PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
-KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-
+# Default bootloader expects "zImage", use "uImage" for u-boot
+# Note: kexecboot can boot both kind of images
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
 KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
diff --git a/conf/machine/mh355.conf b/conf/machine/mh355.conf
new file mode 100644
index 0000000000..5fdb9f4f3d
--- /dev/null
+++ b/conf/machine/mh355.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: Microhard MH355 CPU Module based on AT91SAM9263 processor <http://www.microhard.biz>
+#@DESCRIPTION: Machine.configuration for the Microhard board with MH355 module
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-xorg"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget screen touchscreen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/mpc8641-hpcn.conf b/conf/machine/mpc8641-hpcn.conf
new file mode 100644
index 0000000000..ef75be3112
--- /dev/null
+++ b/conf/machine/mpc8641-hpcn.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@Name: MPC8641-hpcn
+#@DESCRIPTION: Machine configuration for the freescale mpc8641_hpcn development board
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 vfat nfs uboot"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0"
+
+UBOOT_MACHINE = "MPC8641HPCN_config"
+
+# Need to create jffs2 images with the correct endianess
+EXTRA_IMAGECMD_jffs2 = " --big-endian -e 0x10000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+#setup serial console on Com1
+SERIAL_CONSOLE = "-L 115200 ttyS0"
+
+# Tune for e600 core
+require conf/machine/include/tune-ppce600.inc
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index 4880ea47de..4ceb936c61 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -15,6 +15,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 require conf/machine/include/omap3.inc
 
+# omap3.inc redefine it to uImage
+KERNEL_IMAGETYPE = "zImage"
+
 ROOT_FLASH_SIZE = "100"
 EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n"
 
@@ -28,3 +31,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat"
+
+# Copied from include/omap3.inc (as we do not use linux-omap recipes):
+#
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r52"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 822403a710..ede2a2009e 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32"
 
-PREFERRED_PROVIDER_virtual/libgl_shr = "mesa"
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
 
 UBOOT_ENTRYPOINT = "30008000"
 
@@ -29,7 +29,7 @@ MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
            xf86-input-tslib \
            xf86-input-evdev \
-           xf86-video-glamo \
+           xf86-video-fbdev \
            xf86-input-keyboard \
            xf86-input-mouse"
 
@@ -58,15 +58,7 @@ ROOT_FLASH_SIZE = "60"
 IMAGE_FSTYPES += "tar.gz jffs2 ubi"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
-  --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-  --littleendian --pad \
-  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
-  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
-  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
-  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # From dmesg:
@@ -74,7 +66,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
 # UBI: logical eraseblock size:    15360 bytes
 # from ubiattach stdout:
 # UBI device number 0, total 3907  LEBs
-MKUBIFS_ARGS = "-m 512 -e 15360 -c 2047"
+MKUBIFS_ARGS = "-m 512 -e 15360 -c 2376"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # from dmesg:
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index eb48d01aac..9733269d4f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -41,7 +41,11 @@ READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-modules \
+  kernel-module-s3cmci \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-neo1973-gta02-wm8753 \
+  kernel-module-g-ether \
+  kernel-module-ar6000 \
 "
 
 # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index 4732f68c98..ab0612f292 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -14,10 +14,7 @@ XSERVER = "xserver-xorg \
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
-
+require conf/machine/include/omap3.inc
 
 IMAGE_FSTYPES += "tar.bz2 jffs2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf
index 749339faea..698b24178f 100644
--- a/conf/machine/omapzoom2.conf
+++ b/conf/machine/omapzoom2.conf
@@ -29,7 +29,8 @@ KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
-UBOOT_MACHINE = "omap3_zoom2_config"
+UBOOT_MACHINE = "omap3430zoom2_config"
+XLOAD_MACHINE = "omap3430zoom2_config"
 
 # do ubiattach /dev/ubi_ctrl -m 4
 # From dmesg:
diff --git a/conf/machine/omapzoom36x.conf b/conf/machine/omapzoom36x.conf
new file mode 100644
index 0000000000..88b39f4632
--- /dev/null
+++ b/conf/machine/omapzoom36x.conf
@@ -0,0 +1,38 @@
+#@TYPE: Machine
+#@NAME: omapzoom36x machine
+#@DESCRIPTION: Machine configuration for the OMAP Zoom36x at http://omapzoom.org
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Has HDMI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+IMAGE_FSTYPES += "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttyS3"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-zoomsync"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_MACHINE = "omap3630zoom3_config"
+XLOAD_MACHINE = "omap3630zoom3_config"
+
+PREFERRED_VERSION_u-boot = "git"
+PREFERRED_VERSION_x-load = "git"
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
+
+MACHINE_EXTRA_RRECOMMENDS = ""
+MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/p2020ds.conf b/conf/machine/p2020ds.conf
new file mode 100644
index 0000000000..996a3becc0
--- /dev/null
+++ b/conf/machine/p2020ds.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: P2020ds
+#@DESCRIPTION: Machine configuration for the freescale p2020ds development board
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 vfat nfs uboot"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0"
+
+UBOOT_MACHINE = "P2020DS_config"
+
+# Need to create jffs2 images with the correct endianess
+EXTRA_IMAGECMD_jffs2 = " --big-endian -e 0x20000"
+
+#don't try to access tty1
+USE_VT = "0"
+
+#setup serial console on Com1
+SERIAL_CONSOLE = "-L 115200 ttyS0"
diff --git a/conf/machine/xilinx-ml507.conf b/conf/machine/xilinx-ml507.conf
new file mode 100644
index 0000000000..693f904012
--- /dev/null
+++ b/conf/machine/xilinx-ml507.conf
@@ -0,0 +1,38 @@
+# Copyright (C) 2010, Adrian Alonso <aalonso00@gmail.com>
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@Name: Xilinx ML507 FPGA Development Platform
+#@DESCRIPTION: Machine configuration for Xilinx ML507
+
+TARGET_ARCH = "powerpc"
+TARGET_CPU = "440"
+TARGET_FPU = "soft"
+#tune for the 440 cpu
+require conf/machine/include/tune-ppc440.inc
+
+#ASSUME_PROVIDED += "virtual/kernel"
+PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-ml507"
+
+KERNEL_IMAGETYPE = "uImage"
+
+MACHINE_FEATURES = "kernel26 apm ext2 vfat ethernet"
+MACHINE_EXTRA_RECOMMENDS = "kernel-modules"
+
+UBOOT_ARCH = "ppc"
+UBOOT_MACHINE = "ml507_config"
+UBOOT_ENTRYPOINT ?= "0x00000000"
+UBOOT_LOADADDRESS ?= "0x00000000"
+PREFERRED_VERSION_u-boot_xilinx-ml507 = "git"
+
+# Xilinx EDK override hardware  definitions for xilinx-bsp
+# Include in your local.conf
+# XILINX_BSP_PATH = "complete path for Xilinx XPS project"
+# XILINX_BOARD = "ml507"
+
+# Don't use tty1
+USE_VT = "0"
+SERIAL_CONSOLE = "9600 ttyS0"
+
+# Device nodes add xsa for (system ace)
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+                       files/device_table_add-xsa.txt"