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

7 files changed, 47 insertions, 20 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b06153b0ee..e42c704bd5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2742,6 +2742,10 @@ sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
 md5=c1106f56f8e5562cf7c49d3455d2c5f7
 sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.39.tar.gz]
+md5=ba06291b737077332e914d6d653501c6
+sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -8882,6 +8886,10 @@ sha256=980320814b23cc51303436afb110397b15b950896f7f229484005f81d5cb6346
 md5=41b1ef201e4583e55a7462f1404de70d
 sha256=f8eb8f0c3af15acd5ad8c17fcc6d1ed2a43c35877d68a403eeb5bc1a1f0b3ccf
 
+[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.50.tar.bz2]
+md5=67765a32def3ee408e84b9814b4e9759
+sha256=e7a13c0fd3eb0768034008778cb724aed8fbdf63d460d4df7212c3d2c14325b9
+
 [http://gpe.linuxtogo.org/download/source/gpe-nmf-0.17.tar.gz]
 md5=3fd22f7d95f9e1f328d768dedf7313a5
 sha256=6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d
@@ -18374,6 +18382,14 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
 md5=26f67d99666834cc579094619821d3c8
 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
+md5=05daeda25430fd13bbdb47b3481f7320
+sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
+
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2]
+md5=cd69d16ea42bbf20d0a505690be45868
+sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2]
 md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
 sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
@@ -26802,6 +26818,10 @@ sha256=723dbbdfac6e421aa3343a2f1cef7cfb998bb5c045dcf0df870aeba6dd78b79d
 md5=658badd22689cdde536050f740ec8319
 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.24.tar.gz]
+md5=6d7aaa9c267427ddb78faf008cf78187
+sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz]
 md5=b55e9347b9aed725cc7baf91701cdd83
 sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a466834968..bb50220f29 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -17,8 +17,8 @@
 
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
-DISTRO_REVISION = "1"
-DISTRO_PR = ".1"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".2"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}
 
 
 # set feed path variables
-FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
 
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
@@ -99,9 +99,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_486sx      = "4.3.3"
-ANGSTROM_GCC_VERSION_armv7a     = "4.3.3" 
-
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
@@ -109,10 +106,10 @@ ANGSTROM_GCC_VERSION_armv7a     = "4.3.3"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION                     ?= "4.2.4"
+ANGSTROM_GCC_VERSION                     ?= "4.3.3"
 
-#2.19.51.0.3
-ANGSTROM_BINUTILS_VERSION                ?= "2.18.50.0.7"
+ANGSTROM_BINUTILS_VERSION                ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv7a         ?= "2.18.50.0.7"
 
 PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
 PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d8c3cd78df..7e921bf06a 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc
 
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb"
 
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 49326f4806..bd78008dd0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -253,7 +253,7 @@ SRCREV_pn-webkit-gtk ?= "43434"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
+SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index 20e14af78f..f46d4f5822 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -7,7 +7,13 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.29"
 
-# used by sysvinit_2
+# This is not necessarily true, there is a 800x480 display as well
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "110"
+
+# used by sysvinit
 SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
@@ -17,4 +23,8 @@ MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa eth
 require conf/machine/include/tune-arm920t.inc
 
 KERNEL_IMAGETYPE = "uImage"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n \
+        ; sumtool -e16KiB --no-cleanmarkers \
+        --littleendian --pad \
+        -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index c31828aafe..94ca2946e6 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -7,7 +7,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -15,7 +15,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER = "xserver-xorg \
+           xf86-input-tslib \
+           xf86-video-glamo \
+           xf86-input-keyboard"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/topas910.conf b/conf/machine/topas910.conf
index e4b9aead8a..c36dc3bc83 100644
--- a/conf/machine/topas910.conf
+++ b/conf/machine/topas910.conf
@@ -26,13 +26,13 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
-ROOT_FLASH_SIZE = "256"
+ROOT_FLASH_SIZE = "16"
 
 # extra jffs2 tweaks
 IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \
-	--pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-	--littleendian --pad \
+	--pad 0x1aa0000 ; sumtool --eraseblock=0x20000 \
+	--littleendian --pad 0x1aa0000 \
 	-i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"