summaryrefslogtreecommitdiff
path: root/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/.mtn2git_empty0
-rw-r--r--conf/machine/include/AT91-LCD.inc15
-rw-r--r--conf/machine/include/AT91.inc51
-rw-r--r--conf/machine/include/afeb9260.inc24
-rw-r--r--conf/machine/include/davinci.inc25
-rw-r--r--conf/machine/include/dm355.inc2
-rw-r--r--conf/machine/include/dm365.inc12
-rw-r--r--conf/machine/include/dm6446.inc13
-rw-r--r--conf/machine/include/gumstix.inc24
-rw-r--r--conf/machine/include/htc-msm7.inc23
-rw-r--r--conf/machine/include/initramfs-kexecboot.inc13
-rw-r--r--conf/machine/include/ixp4xx.inc4
-rw-r--r--conf/machine/include/kirkwood.inc24
-rw-r--r--conf/machine/include/lsppc.inc14
-rw-r--r--conf/machine/include/motorola-ezx-base.inc9
-rw-r--r--conf/machine/include/neuros.inc29
-rw-r--r--conf/machine/include/omap3.inc23
-rw-r--r--conf/machine/include/omapl137.inc1
-rw-r--r--conf/machine/include/omapl138.inc1
-rw-r--r--conf/machine/include/orion.inc24
-rw-r--r--conf/machine/include/palm.inc1
-rw-r--r--conf/machine/include/qemu.inc2
-rw-r--r--conf/machine/include/tune-arm1136-novfp.inc10
-rw-r--r--conf/machine/include/tune-arm1136jf-s.inc6
-rw-r--r--conf/machine/include/tune-arm1176jzf-s.inc7
-rw-r--r--conf/machine/include/tune-arm920t.inc6
-rw-r--r--conf/machine/include/tune-arm926ejs.inc7
-rw-r--r--conf/machine/include/tune-arm9tdmi.inc8
-rw-r--r--conf/machine/include/tune-armv7.inc11
-rw-r--r--conf/machine/include/tune-at32ap7000.inc3
-rw-r--r--conf/machine/include/tune-athlonmp.inc5
-rw-r--r--conf/machine/include/tune-atom.inc9
-rw-r--r--conf/machine/include/tune-c3.inc5
-rw-r--r--conf/machine/include/tune-cortexa8.inc9
-rw-r--r--conf/machine/include/tune-cortexa9.inc9
-rw-r--r--conf/machine/include/tune-cortexm1.inc3
-rw-r--r--conf/machine/include/tune-cortexm3.inc4
-rw-r--r--conf/machine/include/tune-cortexr4.inc4
-rw-r--r--conf/machine/include/tune-ep9312.inc14
-rw-r--r--conf/machine/include/tune-geode.inc5
-rw-r--r--conf/machine/include/tune-geodelx.inc6
-rw-r--r--conf/machine/include/tune-i486sx.inc9
-rw-r--r--conf/machine/include/tune-iwmmxt.inc5
-rw-r--r--conf/machine/include/tune-mips2.inc1
-rw-r--r--conf/machine/include/tune-mips32.inc1
-rw-r--r--conf/machine/include/tune-pentium.inc7
-rw-r--r--conf/machine/include/tune-pentium4c.inc3
-rw-r--r--conf/machine/include/tune-pentiummmx.inc4
-rw-r--r--conf/machine/include/tune-pentiumpro.inc7
-rw-r--r--conf/machine/include/tune-ppc405.inc4
-rw-r--r--conf/machine/include/tune-ppc440.inc4
-rw-r--r--conf/machine/include/tune-ppc440e.inc4
-rw-r--r--conf/machine/include/tune-ppc603e.inc4
-rw-r--r--conf/machine/include/tune-ppce300c2.inc5
-rw-r--r--conf/machine/include/tune-ppce300c3.inc4
-rw-r--r--conf/machine/include/tune-ppce500.inc4
-rw-r--r--conf/machine/include/tune-ppce500v2.inc4
-rw-r--r--conf/machine/include/tune-sh3.inc2
-rw-r--r--conf/machine/include/tune-sh4.inc2
-rw-r--r--conf/machine/include/tune-strongarm.inc4
-rw-r--r--conf/machine/include/tune-supersparc.inc3
-rw-r--r--conf/machine/include/tune-thumb.inc2
-rw-r--r--conf/machine/include/tune-x86-nocona.inc1
-rw-r--r--conf/machine/include/tune-x86-prescott.inc1
-rw-r--r--conf/machine/include/tune-x86.inc3
-rw-r--r--conf/machine/include/tune-xscale.inc12
-rw-r--r--conf/machine/include/zaurus-2.6.inc101
-rw-r--r--conf/machine/include/zaurus-kernel.inc16
68 files changed, 560 insertions, 122 deletions
diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/conf/machine/include/.mtn2git_empty
+++ /dev/null
diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
new file mode 100644
index 0000000000..3036295f48
--- /dev/null
+++ b/conf/machine/include/AT91-LCD.inc
@@ -0,0 +1,15 @@
+# Common description for Atmel ARM processors with LCD controller
+
+include conf/machine/include/AT91.inc
+
+MACHINE_FEATURES += "screen touchscreen keyboard"
+
+# Some options we disable for now
+# MACHINE_FEATURES += "apm"
+# MACHINE_FEATURES += "lcd"
+# MACHINE_FEATURES += "bluetooth wifi irda phone gps"
+# MACHINE_FEATURES += "mmc mmcroot fat"
+# MACHINE_FEATURES += "i2c spi serial"
+# MACHINE_FEATURES += "sound libogg libvorbis"
+
+
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc
new file mode 100644
index 0000000000..6c0f8f04ac
--- /dev/null
+++ b/conf/machine/include/AT91.inc
@@ -0,0 +1,51 @@
+# Common description for Atmel ARM processors
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+CPU_FAMILY = "at91"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.32"
+
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#XSERVER = "xserver-kdrive-fbdev"
+# Angstrom defines:
+#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
+
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
+PREFERRED_VERSION_at91bootstrap = "2.13"
+
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.08"
+PREFERRED_VERSION_u-boot = "2009.08"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# PREFERRED_VERSION_mplayer = "svn"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot "
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+MACHINE_EXTRA_RDEPENDS += " kernel-modules "
+#MACHINE_EXTRA_RDEPENDS += " atmel-fixes "
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+#
+# Uncomment or add kernel modules that should be autoloaded
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)}
+#module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)}
+module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)}
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/include/afeb9260.inc b/conf/machine/include/afeb9260.inc
new file mode 100644
index 0000000000..cb3ff9bbe9
--- /dev/null
+++ b/conf/machine/include/afeb9260.inc
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: AFEB9260 development board http://www.oshw.ru/
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# 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/include/davinci.inc b/conf/machine/include/davinci.inc
new file mode 100644
index 0000000000..a262059d45
--- /dev/null
+++ b/conf/machine/include/davinci.inc
@@ -0,0 +1,25 @@
+require conf/machine/include/tune-arm926ejs.inc
+
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r32"
+
+TARGET_ARCH = "arm"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+UBOOT_MACHINE = "davinci_dvevm_config"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+#ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc
new file mode 100644
index 0000000000..d666d5e030
--- /dev/null
+++ b/conf/machine/include/dm355.inc
@@ -0,0 +1,2 @@
+SOC_FAMILY = "dm355"
+
diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc
new file mode 100644
index 0000000000..c53680ea63
--- /dev/null
+++ b/conf/machine/include/dm365.inc
@@ -0,0 +1,12 @@
+SOC_FAMILY = "dm365"
+
+
+# DMAI
+PLATFORM = "dm365"
+XDC_PLATFORM = ti.platforms.evmDM365
+
+# Obsoleted (CE examples rebuild)
+#GPPOS = "LINUX_GCC"
+
+# DMAI recipe
+#TARGET = "dm365_al"
diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc
new file mode 100644
index 0000000000..c14e573c74
--- /dev/null
+++ b/conf/machine/include/dm6446.inc
@@ -0,0 +1,13 @@
+SOC_FAMILY = "dm6446"
+
+# TI DVSDK stuff:
+DSPCFG ?= "DM6446GEMSHMEM"
+DSPLINKDSPCFG ?= "DM6446GEMSHMEM"
+DSPLINKGPPOS ?= "MVL5G"
+DSPLINKPLATFORM ?= "DAVINCI"
+DSPLINKSOC ?= "DM6446"
+DSPPOWERSOC ?= "DM6446"
+GPPOS ?= "LINUX_GCC"
+PLATFORM ?= "dm6446"
+XDC_PLATFORM ?= "ti.platforms.evmDM6446"
+
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 1bc0b2e000..64cf184fab 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -5,19 +5,22 @@
# Don't edit this file unless you *really* know what you are doing!
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te "
+
+#Compile with armv5te optimizations, incompatible with armv4(t) cpus
+require conf/machine/include/tune-xscale.inc
+
PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel"
KERNEL_IMAGETYPE = "uImage"
RDEPENDS_kernel-base = ""
+
KERNEL_IMAGE_MAXSIZE = "1048577"
UBOOT_ENTRYPOINT = "a0008000"
MACHINE_FEATURES += "kernel26 "
-COMBINED_FEATURES ?= ""
-IMAGE_FSTYPES = "jffs2"
+IMAGE_FSTYPES = "jffs2 tar.gz"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids"
SERIAL_CONSOLE = "115200 ttyS0 vt100"
@@ -27,18 +30,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
"
-#
-# The following *should* be in a distro.conf file
-# We include them here to avoid creating a new distro
-
-PREFERRED_VERSION_gumstix-kernel = "2.6.21"
-PREFERRED_VERSION_udev = "115"
-PREFERRED_VERSION_gnuplot = "4.0.0"
-PREFERRED_VERSION_dropbear = "0.47"
-PREFERRED_VERSION_wpa-supplicant = "0.5.8"
-PREFERRED_VERSION_bluez-utils = "3.24"
-PREFERRED_VERSION_bluez-utils-alsa = "3.24"
-PREFERRED_VERSION_bluez-libs = "3.24"
-PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24"
-PREFERRED_VERSION_bluez-hcidump = "1.40"
-
diff --git a/conf/machine/include/htc-msm7.inc b/conf/machine/include/htc-msm7.inc
new file mode 100644
index 0000000000..5d7596f38d
--- /dev/null
+++ b/conf/machine/include/htc-msm7.inc
@@ -0,0 +1,23 @@
+# kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+# xserver
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# capability database
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+# use this for overrides
+MACHINE_CLASS = "htc-msm7"
+
+# features
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
+
+# filesystems
+IMAGE_FSTYPES = "tar.gz"
+
+# CPU
+require conf/machine/include/tune-arm1136-novfp.inc
+
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
new file mode 100644
index 0000000000..6ee1ddc3fa
--- /dev/null
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -0,0 +1,13 @@
+# initramfs-kexecboot specific config options
+
+MACHINE_FEATURES_append = " kexecboot "
+
+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"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index da1e8b7557..192cbb121b 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -3,11 +3,11 @@
#@DESCRIPTION: genric machine configuration for ixp4xx platforms
# Set default for common ixp4xx-based machines
-MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
+MACHINE_FEATURES ?= "kernel26 usbhost pci ext2 vfat redboot apex"
# Select an appropriate default kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.7+svnr${SRCREV}"
# Add packages required for basic networking support
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
new file mode 100644
index 0000000000..c3c59aa48b
--- /dev/null
+++ b/conf/machine/include/kirkwood.inc
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for various different Marvell Kirkwood based devices
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2 vfat mmc"
+MACHINE_TASK_PROVIDER = "task-base"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
+
+MACHINE_KERNEL_PR = "r14"
+
+IMAGE_FSTYPES += "tar.gz ubi"
+SERIAL_CONSOLE = "ttyS0 115200"
+
+# Currently all the orion devices we support use uImage
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x00008000"
+UBOOT_LOADADDRESS = "0x00008000"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/include/lsppc.inc b/conf/machine/include/lsppc.inc
index 632a9ed4cc..50a3ab3c57 100644
--- a/conf/machine/include/lsppc.inc
+++ b/conf/machine/include/lsppc.inc
@@ -2,11 +2,12 @@
#@Name: Buffalo PPC Linkstations
#@DESCRIPTION: Generic Machine configuration for ppc based linkstations
-
TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
-TARGET_FPU = "hard"
+PACKAGE_EXTRA_ARCHS = "ppc"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_EXTRA_RDEPENDS = "kernel-devicetree avr-evtd"
+MACHINE_EXTRA_RRECOMMENDS = "u-boot-utils"
USE_DEVFS = "0"
@@ -22,5 +23,8 @@ udevdir = "/dev"
IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
IMAGE_FSTYPES = "tar.gz"
-#tune for the MPC5200B cpu
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x00000000"
+UBOOT_LOADADDRESS = "0x00000000"
+
require conf/machine/include/tune-ppc603e.inc
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index a9945acd34..75c0f42f7d 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -1,8 +1,7 @@
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "openezx-kernel"
#cat /proc/mtd
#dev: size erasesize name
@@ -14,12 +13,16 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
MACHINE_FEATURES += " iwmmxt"
-
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "180"
+# use this for overrides
+MACHINE_CLASS = "motorola-ezx"
+
+XSERVER = "xserver-kdrive-fbdev"
+
ROOT_FLASH_SIZE = "24"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc
new file mode 100644
index 0000000000..2efc6c77e7
--- /dev/null
+++ b/conf/machine/include/neuros.inc
@@ -0,0 +1,29 @@
+MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
+EXTRA_IMAGECMD_yaffs2 = "0"
+
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-env virtual/kernel neuros-pkggen-native"
+
+neuros_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir -p ${IMAGE_NAME}-installkit/temp
+
+ # Get the latest kernel and u-boot using the foo-<machine>.bin symlinks
+ cp uImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/temp/uImage
+ [ -f u-boot-${MACHINE}.bin ] && cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
+ [ -f default_env.img ] && cp default_env.img ${IMAGE_NAME}-installkit/
+
+ cp ${IMAGE_NAME}.rootfs.yaffs2 ${IMAGE_NAME}-installkit/rootfs.yaffs2
+
+ cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkfs.jffs2 -x lzo -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 --pad=0x400000 -n
+ echo "${MACHINE}" > rootfs.version
+ echo "${MACHINE}" > u-boot.version
+ echo "${MACHINE}" > uImage.version
+ packet_osd2 osd20.pkg '${DISTRO} Developer UPK' default_env.img u-boot.bin uImage.jffs2 rootfs.yaffs2
+ cd ${DEPLOY_DIR_IMAGE}
+
+ cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/osd20.pkg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-osd20.pkg
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
new file mode 100644
index 0000000000..dd1188b7c5
--- /dev/null
+++ b/conf/machine/include/omap3.inc
@@ -0,0 +1,23 @@
+SOC_FAMILY = "omap3"
+
+require conf/machine/include/tune-cortexa8.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r51"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+# Only build u-boot, xload is optional
+EXTRA_IMAGEDEPENDS += "u-boot"
+
+# TI DVSDK stuff:
+# DSPLink rebuild
+DSPLINKDSPCFG ?= "OMAP3530SHMEM"
+DSPLINKGPPOS ?= "OMAPLSP"
+DSPLINKPLATFORM ?= "OMAP3530"
+DSPLINKSOC ?= "3530"
+
+
diff --git a/conf/machine/include/omapl137.inc b/conf/machine/include/omapl137.inc
new file mode 100644
index 0000000000..cd84594f86
--- /dev/null
+++ b/conf/machine/include/omapl137.inc
@@ -0,0 +1 @@
+SOC_FAMILY = "omapl137"
diff --git a/conf/machine/include/omapl138.inc b/conf/machine/include/omapl138.inc
new file mode 100644
index 0000000000..4c222753df
--- /dev/null
+++ b/conf/machine/include/omapl138.inc
@@ -0,0 +1 @@
+SOC_FAMILY = "omapl138"
diff --git a/conf/machine/include/orion.inc b/conf/machine/include/orion.inc
new file mode 100644
index 0000000000..9e16805bd2
--- /dev/null
+++ b/conf/machine/include/orion.inc
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@DESCRIPTION: Machine configuration for various different Marvell Orion based devices
+
+TARGET_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 usbhost ext2 vfat"
+MACHINE_TASK_PROVIDER = "task-base"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-orion"
+PREFERRED_VERSION_linux-orion = "2.6.28.4"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+SERIAL_CONSOLE = "ttyS0 115200"
+
+# Currently all the orion devices we support use uImage
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x00008000"
+UBOOT_LOADADDRESS = "0x00008000"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc
index 22c6ad4233..5394855523 100644
--- a/conf/machine/include/palm.inc
+++ b/conf/machine/include/palm.inc
@@ -3,7 +3,6 @@
#
TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc
index 26d1e3f8ca..190066bca0 100644
--- a/conf/machine/include/qemu.inc
+++ b/conf/machine/include/qemu.inc
@@ -2,7 +2,7 @@ PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen keyboard touchscreen"
IMAGE_FSTYPES ?= "tar.bz2 ext2"