14 files changed, 136 insertions, 27 deletions
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/conf/machine/include/omap3.inc
@@ -1,7 +1,9 @@
+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 = "r47" 
+MACHINE_KERNEL_PR = "r51"
 
 KERNEL_IMAGETYPE = "uImage"
 
@@ -11,20 +13,11 @@ UBOOT_LOADADDRESS = "0x80008000"
 # Only build u-boot, xload is optional
 EXTRA_IMAGEDEPENDS += "u-boot"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
-
 # TI DVSDK stuff:
-CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
-DEVICES           ?= "OMAP3530"
-DSPCFG            ?= "OMAP3530SHMEM"
+# DSPLink rebuild
 DSPLINKDSPCFG     ?= "OMAP3530SHMEM"
 DSPLINKGPPOS      ?= "OMAPLSP"
 DSPLINKPLATFORM   ?= "OMAP3530"
 DSPLINKSOC        ?= "3530"
-DSPPOWERSOC       ?= "omap3530"
-GPPOS             ?= "LINUX_GCC"
-LPMDSPPOWERSOC    ?= "omap3530"
-PLATFORM          ?= "omap3530"
-XDC_PLATFORM      ?= "ti.platforms.evm3530"
+
 
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/tune-atom.inc b/conf/machine/include/tune-atom.inc
new file mode 100644
index 0000000000..44058c12be
--- /dev/null
+++ b/conf/machine/include/tune-atom.inc
@@ -0,0 +1,9 @@
+# GCC 4.3.0- (see Poky)
+# TARGET_CC_ARCH = "-march=i586"
+# GCC 4.3.1+ (see Gentoo)
+TARGET_CC_ARCH = "-march=core2"
+# GCC 4.4.2+ (see Fedora 12)
+#TARGET_CC_ARCH = "-march=i686 -mtune=atom"
+BASE_PACKAGE_ARCH = "i686"
+FEED_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
+\ No newline at end of file
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 2a583fe6e4..fe57c9ccc0 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -2,8 +2,7 @@
 # gcc does not differentiate between the different Strongarm versions, so neither do we
 # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
 
-ARM_ABI = "oabi"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
-FEED_ARCH = "arm-oabi"
-PACKAGE_BASE_ARCH = "armv4" 
-PACKAGE_EXTRA_ARCHS += "armv4 "
+FEED_ARCH = "armv4"
+BASE_PACKAGE_ARCH = "armv4" 
+PACKAGE_EXTRA_ARCHS += "armv4"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b5a6..02a48629c8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer"
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
+# FIXME: xserver-xorg is in testing
+
+# deprecated defaults
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# c7x0 uses kdrive-imageon (W100)
 PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+XSERVER_c7x0 = "xserver-kdrive-imageon"
+
+# collie uses kdrive-fbdev
 PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+XSERVER_collie = "xserver-kdrive-fbdev"
+
+# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
+PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
+XSERVER_akita = "xserver-kdrive-1300-fbdev"
+
+# spitz uses xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
+XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index d9f1c1ba85..1ba4a3422d 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -3,6 +3,9 @@
 MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+
+# Starting with 2.6.32 linux-rp is deprecated
+#PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"