summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/alix.conf2
-rw-r--r--conf/machine/am3517-evm.conf (renamed from conf/machine/omap3517-evm.conf)3
-rw-r--r--conf/machine/archos5.conf41
-rw-r--r--conf/machine/at91sam9g45ek.conf29
-rw-r--r--conf/machine/beagleboard.conf1
-rw-r--r--conf/machine/ben-nanonote.conf11
-rw-r--r--conf/machine/bug.conf10
-rw-r--r--conf/machine/c7x0.conf2
-rw-r--r--conf/machine/cm-t35.conf46
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/da830-omapl137-evm.conf1
-rw-r--r--conf/machine/da850-omapl138-evm.conf1
-rw-r--r--conf/machine/davinci-sffsdr.conf1
-rw-r--r--conf/machine/dm355-evm.conf2
-rw-r--r--conf/machine/dm365-evm.conf3
-rw-r--r--conf/machine/dm6446-evm.conf1
-rw-r--r--conf/machine/guinness.conf2
-rw-r--r--conf/machine/hawkboard.conf14
-rw-r--r--conf/machine/htcdream.conf3
-rw-r--r--conf/machine/iei-nanogx-466.conf30
-rw-r--r--conf/machine/igep0020.conf3
-rw-r--r--conf/machine/include/AT91-LCD.inc15
-rw-r--r--conf/machine/include/AT91.inc51
-rw-r--r--conf/machine/include/davinci.inc4
-rw-r--r--conf/machine/include/dm355.inc9
-rw-r--r--conf/machine/include/dm365.inc12
-rw-r--r--conf/machine/include/dm6446.inc13
-rw-r--r--conf/machine/include/kirkwood.inc2
-rw-r--r--conf/machine/include/omap3.inc17
-rw-r--r--conf/machine/include/omapl137.inc1
-rw-r--r--conf/machine/include/omapl138.inc1
-rw-r--r--conf/machine/include/tune-atom.inc9
-rw-r--r--conf/machine/include/tune-strongarm.inc7
-rw-r--r--conf/machine/include/zaurus-2.6.inc19
-rw-r--r--conf/machine/include/zaurus-kernel.inc3
-rw-r--r--conf/machine/ion.conf21
-rw-r--r--conf/machine/jornada6xx.conf13
-rw-r--r--conf/machine/mtcdp-embedded.conf29
-rw-r--r--conf/machine/mtcdp.conf29
-rw-r--r--conf/machine/neuros-osd2.conf1
-rw-r--r--conf/machine/nhk15.conf7
-rw-r--r--conf/machine/om-gta01.conf16
-rw-r--r--conf/machine/om-gta02.conf44
-rw-r--r--conf/machine/omap3-pandora.conf71
-rw-r--r--conf/machine/omap3-touchbook.conf2
-rw-r--r--conf/machine/omap3evm.conf1
-rw-r--r--conf/machine/omapzoom.conf1
-rw-r--r--conf/machine/omapzoom2.conf1
-rw-r--r--conf/machine/palmpre.conf1
-rw-r--r--conf/machine/progear.conf2
-rw-r--r--conf/machine/qemumips.conf5
-rw-r--r--conf/machine/sgh-i900.conf24
-rw-r--r--conf/machine/simone.conf10
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/x86.conf2
56 files changed, 578 insertions, 81 deletions
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6f71787fa1..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-# xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 10b298c0f0..e116e611ad 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -4,7 +4,7 @@
#
# http://pcengines.ch/alix1c.htm
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i586"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/omap3517-evm.conf b/conf/machine/am3517-evm.conf
index 77ea2807b9..0ee57c407f 100644
--- a/conf/machine/omap3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -15,8 +15,9 @@ GUI_MACHINE_CLASS = "smallscreen"
require conf/machine/include/omap3.inc
+PACKAGE_EXTRA_ARCHS += "omap3517-evm"
+
# Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
IMAGE_FSTYPES ?= "jffs2 tar.bz2"
EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
diff --git a/conf/machine/archos5.conf b/conf/machine/archos5.conf
new file mode 100644
index 0000000000..8640912b0f
--- /dev/null
+++ b/conf/machine/archos5.conf
@@ -0,0 +1,41 @@
+#@TYPE: Machine
+#@NAME: OMAP3 based Archos 5
+#@DESCRIPTION: Machine configuration for the Archos 5
+
+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=128M nohz=off"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen wifi"
+
diff --git a/conf/machine/at91sam9g45ek.conf b/conf/machine/at91sam9g45ek.conf
new file mode 100644
index 0000000000..98fd7113c0
--- /dev/null
+++ b/conf/machine/at91sam9g45ek.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G45EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g45ek development board with a at91sam9g45-ES2 processor
+# Once a at91sam9g45ek development board with a production at91sam9g45 processor
+# is available we should change the recipe to use the at91sam9m10g45ek_defconfig
+
+include conf/machine/include/AT91-LCD.inc
+
+# Has linux config file in OpenEmbedded
+#
+# LINUX26_DEFCONFIG = "at91sam9g45ek_defconfig"
+# LINUX26_DEFCONFIG = "at91sam9m10g45ek_defconfig"
+
+# Supported u-boot machines
+#UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_nandflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_config"
+
+# Boot from Dataflash, so we do not have to reprogram
+# At91bootstrap/U-Boot everytime we erase the NAND flash
+AT91BOOTSTRAP_BOARD = "at91sam9g45df"
+
+MACHINE_FEATURES += "usbhost"
+
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 69cdec6f1f..a5de68e0af 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -41,6 +41,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
PREFERRED_VERSION_u-boot = "git"
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
# and sdio
MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
new file mode 100644
index 0000000000..08bcdea3e5
--- /dev/null
+++ b/conf/machine/ben-nanonote.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: Ben Nanonote
+#@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote
+
+TARGET_ARCH = "mipsel"
+require conf/machine/include/tune-mips32.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben"
+KERNEL_IMAGETYPE = "uImage"
+IMAGE_FSTYPES ?= "jffs2"
+
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index cec3d5b785..d79cf15129 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"
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw"
PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"
@@ -14,3 +14,11 @@ CPU_FEATURES += "vfp"
require conf/machine/include/tune-arm1136jf-s.inc
KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-tslib \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-input-keyboard"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 16073fee82..4daedde482 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc
# please set the right value in your local.conf
ROOT_FLASH_SIZE = "25"
-XSERVER = "xserver-kdrive-imageon"
-
MACHINE_GUI_CLASS = "bigscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "640"
MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/cm-t35.conf b/conf/machine/cm-t35.conf
new file mode 100644
index 0000000000..ccb9f95773
--- /dev/null
+++ b/conf/machine/cm-t35.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: CM-T35 machine
+#@DESCRIPTION: Machine configuration for the CompuLab CM-T35 board (http://www.compulab.co.il/t3530/html/t3530-cm-datasheet.htm)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-input-evtouch \
+ xf86-input-tslib \
+ xf86-video-omapfb \
+ xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+IMAGE_FSTYPES += "tar.bz2 ubi"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+# Guesswork
+SERIAL_CONSOLE = "115200 ttyS2"
+
+UBOOT_MACHINE = "cm_t35_config"
+PREFERRED_VERSION_u-boot = "git"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit: 2048
+# UBI: logical eraseblock size: 126976 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 4039 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4039"
+
+# 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 = "-O 2048 -m 2048 -p 128KiB"
+
+MACHINE_EXTRA_RRECOMMENDS = "marvell-sdio-fw"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi ext2"
+
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 47f6e30dfd..66995e9b09 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14"
# actually 14680064
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-XSERVER = "xserver-kdrive-fbdev"
-
MACHINE_GUI_CLASS = "smallscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf
index 4df4d63cca..0164e1c27d 100644
--- a/conf/machine/da830-omapl137-evm.conf
+++ b/conf/machine/da830-omapl137-evm.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/omapl137.inc
UBOOT_MACHINE = "da830_omapl137_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index bbcb45002e..b61c00ca27 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
UBOOT_MACHINE = "da850_omapl138_evm_config"
UBOOT_ENTRYPOINT = "0xc0008000"
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e3c0554f71..63fc2cacc4 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial"
#MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/dm6446.inc
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf
index 73c9f1e017..a352b5e926 100644
--- a/conf/machine/dm355-evm.conf
+++ b/conf/machine/dm355-evm.conf
@@ -5,4 +5,4 @@
require conf/machine/include/davinci.inc
require conf/machine/include/dm355.inc
-UBOOT_MACHINE = "davinci_dm355evm_config"
+UBOOT_MACHINE = "davinci_dm355_evm_config"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 7cea5dc727..5a5161673b 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -3,5 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/dm365.inc
-UBOOT_MACHINE = "davinci_dm365evm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf
index 8b048a5474..aaa7492991 100644
--- a/conf/machine/dm6446-evm.conf
+++ b/conf/machine/dm6446-evm.conf
@@ -3,5 +3,6 @@
#@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board
require conf/machine/include/davinci.inc
+require conf/machine/include/dm6446.inc
UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index f17451556f..dd21c1ecc2 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -2,7 +2,7 @@
#@NAME: Guinness
#@DESCRIPTION: Machine configuration for Linux running on a tyan 2462 mainboard (codenamed guinness)
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i686"
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
new file mode 100644
index 0000000000..ae53a53377
--- /dev/null
+++ b/conf/machine/hawkboard.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: OMAP-L138 based board
+#@DESCRIPTION: Machine configuration for the TI Hawkboard
+
+require conf/machine/include/davinci.inc
+require conf/machine/include/omapl138.inc
+
+UBOOT_MACHINE = "da850_omapl138_evm_config"
+UBOOT_ENTRYPOINT = "0xc0008000"
+UBOOT_LOADADDRESS = "0xc0008000"
+
+MACHINE_FEATURES = "kernel26 serial ethernet ide screen"
+
+SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf
index 7f7680a732..d09782c40f 100644
--- a/conf/machine/htcdream.conf
+++ b/conf/machine/htcdream.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: HTC Dream
-#@DESCRIPTION: Machine configuration for HTC Dream smartphone
+#@DESCRIPTION: Machine configuration for HTC Dream phone (aka T-Mobile G1 and Google ADP-1)
require conf/machine/include/htc-msm7.inc
@@ -10,4 +10,3 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usbgadget bluetooth keyboard ext2"
PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
-
diff --git a/conf/machine/iei-nanogx-466.conf b/conf/machine/iei-nanogx-466.conf
new file mode 100644
index 0000000000..3bab3070c6
--- /dev/null
+++ b/conf/machine/iei-nanogx-466.conf
@@ -0,0 +1,30 @@
+# Copyright (C) 2009, Petr Stetiar
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: IEI Nano GX-466
+#@DESCRIPTION: Machine configuration for IEI Nano GX-466 - http://bit.ly/t9TOj
+
+TARGET_ARCH = "i586"
+
+require conf/machine/include/tune-geode.inc
+
+MACHINE_FEATURES = "kernel26 pci vfat ext2 keyboard usbhost sound touchscreen screen serial ethernet"
+
+KERNEL_IMAGETYPE = "bzImage"
+IMAGE_FSTYPES ?= "ext2 tar.bz2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-input-tslib \
+ xf86-video-geode \
+ xerver-xorg-module-libint10 \
+ xserver-xorg-module-xaa \
+ xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=i586"
diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf
index 512a977748..55c18507c3 100644
--- a/conf/machine/igep0020.conf
+++ b/conf/machine/igep0020.conf
@@ -19,6 +19,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-igep2"
KERNEL_IMAGETYPE = "uImage"
+UBOOT_MACHINE = "omap3_igep0020b_config"
+
IMAGE_FSTYPES += "tar.bz2 ubi"
# Guesswork
@@ -39,5 +41,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
# UBI: sub-page size: 512
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-# MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
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/davinci.inc b/conf/machine/include/davinci.inc
index 206afd46f2..a262059d45 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 = "r10"
+MACHINE_KERNEL_PR = "r32"
TARGET_ARCH = "arm"
@@ -15,7 +15,7 @@ UBOOT_MACHINE = "davinci_dvevm_config"
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
-#EXTRA_IMAGEDEPENDS += "u-boot ubl"
+EXTRA_IMAGEDEPENDS += "u-boot"
SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc
index dffafe4460..d666d5e030 100644
--- a/conf/machine/include/dm355.inc
+++ b/conf/machine/include/dm355.inc
@@ -1,9 +1,2 @@
-
-DEVICES = "DM355"
-GPPOS = "LINUX_GCC"
-PLATFORM = "dm355"
-PROGRAMS = "APP_LOCAL"
-TARGET = "dm355_al"
-XDC_PLATFORM = ti.platforms.evmDM355
-
+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/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 20f53bf643..c3c59aa48b 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 = "r11"
+MACHINE_KERNEL_PR = "r14"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 675249a064..dd1188b7c5 100644
--- a/conf/machine/include/omap3.inc
+++ b/