Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

6 files changed, 92 insertions, 3 deletions

diff --git a/conf/machine/calamari.conf b/conf/machine/calamari.conf
new file mode 100644
index 0000000000..2f4af15d9b
--- /dev/null
+++ b/conf/machine/calamari.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@Name: Freescale MPC8536DS Calamari
+#@DESCRIPTION: Machine configuration for the Freescale MPC8536DS Calamari Development System
+
+# Development board with 1.5 GHz dual-issue PowerPC SoC with MMU/FPU and PCI,
+# 3x PCI Express up to x8, 2x SATA.
+
+TARGET_ARCH = "powerpc"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+
+KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_VERSION_u-boot ?= "2009.06"
+UBOOT_MACHINE = "MPC8536DS_config"
+UBOOT_ENTRYPOINT = "0"
+UBOOT_LOADADDRESS = "0"
+
+#rootfs on NAND flash
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers"
+
+#don't try to access tty1
+USE_VT = "0"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+#tune for the e500v2 core
+require conf/machine/include/tune-ppce500v2.inc
+
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index af9dc0ff9c..32211a07a5 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 = "r8"
+MACHINE_KERNEL_PR = "r9"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 8e90453d4c..ea395b441b 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 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 = "r37" 
+MACHINE_KERNEL_PR = "r39" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/tune-ppce500v2.inc b/conf/machine/include/tune-ppce500v2.inc
new file mode 100644
index 0000000000..73d8e92f0a
--- /dev/null
+++ b/conf/machine/include/tune-ppce500v2.inc
@@ -0,0 +1,4 @@
+TARGET_CC_ARCH = "-mcpu=8548 -mspe=yes -mabi=spe -mhard-float -mfloat-gprs=double"
+BASE_PACKAGE_ARCH = "ppce500v2"
+FEED_ARCH = "ppce500v2"
+PACKAGE_EXTRA_ARCHS += "ppce500v2"
diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf
new file mode 100644
index 0000000000..dd76a9fd38
--- /dev/null
+++ b/conf/machine/omapzoom2.conf
@@ -0,0 +1,54 @@
+#@TYPE: Machine
+#@NAME: omapzoom2 machine
+#@DESCRIPTION: Machine configuration for the zoom2 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-input-keyboard"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+require conf/machine/include/omap3.inc
+
+IMAGE_FSTYPES += "tar.bz2 jffs2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+# Guesswork
+SERIAL_CONSOLE = "115200 ttyS2"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_MACHINE = "omap3_zoom2_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"
+#EXTRA_IMAGEDEPENDS += "u-boot x-load"
+
+#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+# and sdio
+MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf
index 92a8fef3df..8ec67b0ce6 100644
--- a/conf/machine/tx25.conf
+++ b/conf/machine/tx25.conf
@@ -9,7 +9,7 @@ MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camer
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.30"
+PREFERRED_VERSION_linux = "2.6.29+2.6.30-rc4"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"