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

6 files changed, 101 insertions, 4 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0853484291..660aa5a484 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -54,6 +54,10 @@ sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
 md5=4469d6336f9659f1725fedd4a52261ad
 sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
 
+[http://maxim.org.za/AT91RM9200/2.6/2.6.30-at91.patch.gz]
+md5=f13ab353b11329ce3d605b6f40e77fa6
+sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
+
 [http://sense.net/zc/free42/42c_skins.tgz]
 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
@@ -11670,6 +11674,10 @@ sha256=bc4f62cbac4716c2c1a25cf53b73343a03883964576d9dd590a9e4c7a70f465a
 md5=a746183ea41aebc27a0f771036f668e1
 sha256=1b8f50169bc2d827c6efe6bc98bbef2161f615219e4e8921e68227888fd50a9e
 
+[http://iij.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
+md5=886a114b391aa1992567019213efc63e
+sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
+
 [http://osdn.dl.sourceforge.jp/julius/37582/julius-4.1.2.tar.gz]
 md5=886a114b391aa1992567019213efc63e
 sha256=542c7f1042679c8484dc2f5f5536ed0c79fa79b2b9dd6cf6881278a6fdb37a84
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 470bace2b8..0e1a25a4b7 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -202,9 +202,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "209"
-SRCREV_pn-opkg-native ?= "209"
-SRCREV_pn-opkg-sdk ?= "209"
+SRCREV_pn-opkg ?= "215"
+SRCREV_pn-opkg-native ?= "215"
+SRCREV_pn-opkg-sdk ?= "215"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
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/omap3.inc b/conf/machine/include/omap3.inc
index 97327f0db7..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 = "r38" 
+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"