137 files changed, 68 insertions, 30 deletions

diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb
index ba5f712bb8..8e38b17f30 100644
--- a/packages/linux/linux-rp_2.6.23.bb
+++ b/packages/linux/linux-rp_2.6.23.bb
@@ -1,10 +1,9 @@
 require linux-rp.inc
 
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
-DEFAULT_PREFERENCE_poodle = "-99"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -41,6 +40,8 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
            ${RPSRC}/w100_extmem-r1.patch;patch=1 \
            ${RPSRC}/spitzkbd_fix-r0.patch;patch=1 \
            ${RPSRC}/export_atags-r0.patch;patch=1 \
+           ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1 \
+           ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
            file://w100fb-unused-var.patch;patch=1 \
            file://hostap-monitor-mode.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index a35799b75a..aaa9e22f47 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -9,13 +9,20 @@ DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEPENDS_append_mpc8313e-rdb = " dtc-native"
 DEPENDS_append_mpc8323e-rdb = " dtc-native"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 	   file://binutils-buildid-arm.patch;patch=1 \
            file://defconfig \
 	   "
 
+# Bug fixes on the 2.6.23.x stable branch
+SRC_URI += "http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.12.bz2;patch=1"
+# Add support for squashfs-lzma (a highly compressed read-only filesystem)
+SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1"
+# Completely fair scheduler
+SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1"
+
 SRC_URI_append_cm-x270 = "\
 	file://0001-cm-x270-base2.patch;patch=1 \
 	file://0002-cm-x270-match-type.patch;patch=1 \
@@ -88,3 +95,4 @@ do_devicetree_image() {
 
 addtask compulab_image after do_deploy before do_package
 addtask devicetree_image after do_deploy before do_package
+
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index c007899afd..3452f4e3bd 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r43"
+PR = "r44"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -250,6 +250,8 @@ SLUGOS_EXTRA_PACKAGES ?= ""
 DEPENDS = "\
 	slugos-image \
 	slugos-native \
+	task-nas-server-everything \
+	task-proper-tools \
 	${SLUGOS_PACKAGES} \
 	${SLUGOS_EXTRA_PACKAGES} \
 	package-index \
diff --git a/packages/uboot/.mtn2git_empty b/packages/u-boot/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/.mtn2git_empty
+++ b/packages/u-boot/.mtn2git_empty
diff --git a/packages/uboot/files/.mtn2git_empty b/packages/u-boot/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/files/.mtn2git_empty
+++ b/packages/u-boot/files/.mtn2git_empty
diff --git a/packages/uboot/files/arm_flags.patch b/packages/u-boot/files/arm_flags.patch
index 84b8cada39..84b8cada39 100644
--- a/packages/uboot/files/arm_flags.patch
+++ b/packages/u-boot/files/arm_flags.patch
diff --git a/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch b/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
new file mode 100644
index 0000000000..c97880a01c
--- /dev/null
+++ b/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch
@@ -0,0 +1,29 @@
+--- git.orig/drivers/video/cfb_console.c	2007-12-27 00:59:35.000000000 -0800
++++ git/drivers/video/cfb_console.c	2007-12-27 08:23:42.000000000 -0800
+@@ -141,6 +141,14 @@
+ #endif
+ 
+ /*****************************************************************************/
++/* Defines for the S3C2410 driver					     */
++/*****************************************************************************/
++#ifdef CONFIG_VIDEO_S3C2410
++/* it actually is little-endian, but the host CPU, too ! */
++//#define VIDEO_FB_LITTLE_ENDIAN
++#endif
++
++/*****************************************************************************/
+ /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc	     */
+ /*****************************************************************************/
+ #include <video_fb.h>
+@@ -309,6 +317,11 @@
+ #define SHORTSWAP32(x)	 (x)
+ #endif
+ 
++#ifdef CONFIG_VIDEO_S3C2410
++#undef SHORTSWAP32
++#define	SHORTSWAP32(x)	((((x) & 0xffff) << 16) | (((x) >> 16) & 0xffff))
++#endif
++
+ #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE)
+ #define PRINTD(x)	  printf(x)
+ #else
diff --git a/packages/uboot/files/fix-arm920t-eabi.patch b/packages/u-boot/files/fix-arm920t-eabi.patch
index 9896388c8f..9896388c8f 100644
--- a/packages/uboot/files/fix-arm920t-eabi.patch
+++ b/packages/u-boot/files/fix-arm920t-eabi.patch
diff --git a/packages/uboot/files/makefile-no-dirafter.patch b/packages/u-boot/files/makefile-no-dirafter.patch
index 2ed26c3127..2ed26c3127 100644
--- a/packages/uboot/files/makefile-no-dirafter.patch
+++ b/packages/u-boot/files/makefile-no-dirafter.patch
diff --git a/packages/uboot/files/u-boot-20061030-ext2load_hex.patch b/packages/u-boot/files/u-boot-20061030-ext2load_hex.patch
index 3cecb7485d..3cecb7485d 100644
--- a/packages/uboot/files/u-boot-20061030-ext2load_hex.patch
+++ b/packages/u-boot/files/u-boot-20061030-ext2load_hex.patch
diff --git a/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
index e90cc0de71..e90cc0de71 100644
--- a/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
+++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
diff --git a/packages/uboot/files/uboot-eabi-fix-HACK.patch b/packages/u-boot/files/uboot-eabi-fix-HACK.patch
index 65b212917d..65b212917d 100644
--- a/packages/uboot/files/uboot-eabi-fix-HACK.patch
+++ b/packages/u-boot/files/uboot-eabi-fix-HACK.patch
diff --git a/packages/uboot/u-boot-1.1.2/.mtn2git_empty b/packages/u-boot/u-boot-1.1.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.1.2/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.1.2/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.1.2/arm_flags.patch b/packages/u-boot/u-boot-1.1.2/arm_flags.patch
index 48c7b78043..48c7b78043 100644
--- a/packages/uboot/u-boot-1.1.2/arm_flags.patch
+++ b/packages/u-boot/u-boot-1.1.2/arm_flags.patch
diff --git a/packages/uboot/u-boot-1.1.2/cmd-arm-linux.patch b/packages/u-boot/u-boot-1.1.2/cmd-arm-linux.patch
index e7ef37e061..e7ef37e061 100644
--- a/packages/uboot/u-boot-1.1.2/cmd-arm-linux.patch
+++ b/packages/u-boot/u-boot-1.1.2/cmd-arm-linux.patch
diff --git a/packages/uboot/u-boot-1.1.2/command-names.patch b/packages/u-boot/u-boot-1.1.2/command-names.patch
index dd9a7fab44..dd9a7fab44 100644
--- a/packages/uboot/u-boot-1.1.2/command-names.patch
+++ b/packages/u-boot/u-boot-1.1.2/command-names.patch
diff --git a/packages/uboot/u-boot-1.1.2/mnci-jffs2.patch b/packages/u-boot/u-boot-1.1.2/mnci-jffs2.patch
index 8b2571ad99..8b2571ad99 100644
--- a/packages/uboot/u-boot-1.1.2/mnci-jffs2.patch
+++ b/packages/u-boot/u-boot-1.1.2/mnci-jffs2.patch
diff --git a/packages/uboot/u-boot-1.1.2/mnci.patch b/packages/u-boot/u-boot-1.1.2/mnci.patch
index d69cf8eb72..d69cf8eb72 100644
--- a/packages/uboot/u-boot-1.1.2/mnci.patch
+++ b/packages/u-boot/u-boot-1.1.2/mnci.patch
diff --git a/packages/uboot/u-boot-1.1.2/u-boot-1.1.2-neon.patch b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch
index ed959d43d8..ed959d43d8 100644
--- a/packages/uboot/u-boot-1.1.2/u-boot-1.1.2-neon.patch
+++ b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch
diff --git a/packages/uboot/u-boot-1.1.2/u-boot-emetec.patch b/packages/u-boot/u-boot-1.1.2/u-boot-emetec.patch
index ab3f106e71..ab3f106e71 100644
--- a/packages/uboot/u-boot-1.1.2/u-boot-emetec.patch
+++ b/packages/u-boot/u-boot-1.1.2/u-boot-emetec.patch
diff --git a/packages/uboot/u-boot-1.1.4/.mtn2git_empty b/packages/u-boot/u-boot-1.1.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.1.4/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.1.4/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-autoscript.patch b/packages/u-boot/u-boot-1.1.4/u-boot-autoscript.patch
index 1864b4494e..1864b4494e 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-autoscript.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-autoscript.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-base.patch b/packages/u-boot/u-boot-1.1.4/u-boot-base.patch
index d866c1c26e..d866c1c26e 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-base.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-base.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch b/packages/u-boot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch
index b5736894c6..b5736894c6 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch b/packages/u-boot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch
index d919ea504e..d919ea504e 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch b/packages/u-boot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch
index 1bbbbcb32d..1bbbbcb32d 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-fw_printenv.patch b/packages/u-boot/u-boot-1.1.4/u-boot-fw_printenv.patch
index 5e33452d11..5e33452d11 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-fw_printenv.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-fw_printenv.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-install.patch b/packages/u-boot/u-boot-1.1.4/u-boot-install.patch
index 50c149c0a1..50c149c0a1 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-install.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-install.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-jerase-cmd.patch b/packages/u-boot/u-boot-1.1.4/u-boot-jerase-cmd.patch
index 698f7a2d78..698f7a2d78 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-jerase-cmd.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-jerase-cmd.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch b/packages/u-boot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch
index cce41aca18..cce41aca18 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-loadb-safe.patch b/packages/u-boot/u-boot-1.1.4/u-boot-loadb-safe.patch
index d4b8ef3935..d4b8ef3935 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-loadb-safe.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-loadb-safe.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch b/packages/u-boot/u-boot-1.1.4/u-boot-make381-fix.patch
index 89555ac027..89555ac027 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-make381-fix.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-mmc-init.patch b/packages/u-boot/u-boot-1.1.4/u-boot-mmc-init.patch
index a18d4d3609..a18d4d3609 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-mmc-init.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-mmc-init.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch b/packages/u-boot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch
index 5eb8324630..5eb8324630 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-smc91x-multi.patch b/packages/u-boot/u-boot-1.1.4/u-boot-smc91x-multi.patch
index 3f285e34dc..3f285e34dc 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-smc91x-multi.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-smc91x-multi.patch
diff --git a/packages/uboot/u-boot-1.1.4/u-boot-zzz-osx.patch b/packages/u-boot/u-boot-1.1.4/u-boot-zzz-osx.patch
index f9d52c7dfe..f9d52c7dfe 100644
--- a/packages/uboot/u-boot-1.1.4/u-boot-zzz-osx.patch
+++ b/packages/u-boot/u-boot-1.1.4/u-boot-zzz-osx.patch
diff --git a/packages/uboot/u-boot-1.1.6/.mtn2git_empty b/packages/u-boot/u-boot-1.1.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.1.6/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.1.6/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.1.6/devkit-idp.patch b/packages/u-boot/u-boot-1.1.6/devkit-idp.patch
index 1460c3d1f0..1460c3d1f0 100644
--- a/packages/uboot/u-boot-1.1.6/devkit-idp.patch
+++ b/packages/u-boot/u-boot-1.1.6/devkit-idp.patch
diff --git a/packages/uboot/u-boot-1.1.6/sarge-uboot.patch b/packages/u-boot/u-boot-1.1.6/sarge-uboot.patch
index 0c0d56f4d1..0c0d56f4d1 100644
--- a/packages/uboot/u-boot-1.1.6/sarge-uboot.patch
+++ b/packages/u-boot/u-boot-1.1.6/sarge-uboot.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch
index fe85228771..fe85228771 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch
index 5018cd3434..5018cd3434 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch
index b5e2a87b16..b5e2a87b16 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch
index 23a9717e74..23a9717e74 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch
index ad2ff243e8..ad2ff243e8 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch
index 9e2829bd3e..9e2829bd3e 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch
index 5f3e1f7aaa..5f3e1f7aaa 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch
diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch
index 30981dc43c..30981dc43c 100644
--- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch
+++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch
diff --git a/packages/uboot/u-boot-1.2.0/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.2.0/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.2.0/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.2.0/defconfig_lsppchd b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchd
index 5919f5eb2c..5919f5eb2c 100644
--- a/packages/uboot/u-boot-1.2.0/defconfig_lsppchd
+++ b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchd
diff --git a/packages/uboot/u-boot-1.2.0/defconfig_lsppchg b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchg
index b9943b4c76..b9943b4c76 100644
--- a/packages/uboot/u-boot-1.2.0/defconfig_lsppchg
+++ b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchg
diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/u-boot/u-boot-1.2.0/env-Makefile.patch
index f6e9cb39ae..f6e9cb39ae 100644
--- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch
+++ b/packages/u-boot/u-boot-1.2.0/env-Makefile.patch
diff --git a/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config b/packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config
index 9fe07672c5..9fe07672c5 100644
--- a/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config
+++ b/packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config
diff --git a/packages/uboot/u-boot-1.2.0/fw_env.c.patch b/packages/u-boot/u-boot-1.2.0/fw_env.c.patch
index 62f364ad4a..62f364ad4a 100644
--- a/packages/uboot/u-boot-1.2.0/fw_env.c.patch
+++ b/packages/u-boot/u-boot-1.2.0/fw_env.c.patch
diff --git a/packages/uboot/u-boot-1.2.0/fw_env.config b/packages/u-boot/u-boot-1.2.0/fw_env.config
index 2432bd866c..2432bd866c 100644
--- a/packages/uboot/u-boot-1.2.0/fw_env.config
+++ b/packages/u-boot/u-boot-1.2.0/fw_env.config
diff --git a/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff b/packages/u-boot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff
index 02027b1062..02027b1062 100644
--- a/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff
+++ b/packages/u-boot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff
diff --git a/packages/uboot/u-boot-1.2.0/qnap.diff b/packages/u-boot/u-boot-1.2.0/qnap.diff
index b9ac34e6a8..b9ac34e6a8 100644
--- a/packages/uboot/u-boot-1.2.0/qnap.diff
+++ b/packages/u-boot/u-boot-1.2.0/qnap.diff
diff --git a/packages/uboot/u-boot-1.2.0/tools-Makefile.patch b/packages/u-boot/u-boot-1.2.0/tools-Makefile.patch
index a44bc917d6..a44bc917d6 100644
--- a/packages/uboot/u-boot-1.2.0/tools-Makefile.patch
+++ b/packages/u-boot/u-boot-1.2.0/tools-Makefile.patch
diff --git a/packages/uboot/u-boot-1.2.0/turbostation/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-1.2.0/turbostation/.mtn2git_empty
+++ b/packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty
diff --git a/packages/uboot/u-boot-1.2.0/turbostation/fw_env.config b/packages/u-boot/u-boot-1.2.0/turbostation/fw_env.config
index 2432bd866c..2432bd866c 100644
--- a/packages/uboot/u-boot-1.2.0/turbostation/fw_env.config
+++ b/packages/u-boot/u-boot-1.2.0/turbostation/fw_env.config
diff --git a/packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox-fdt.patch
index 182c3785c7..182c3785c7 100644
--- a/packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch
+++ b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox-fdt.patch
diff --git a/packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox.patch
index 79f7a8e48a..79f7a8e48a 100644
--- a/packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch
+++ b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox.patch
diff --git a/packages/uboot/u-boot-1.2.0/uboot-qnap.diff b/packages/u-boot/u-boot-1.2.0/uboot-qnap.diff
index 2b2a17da7f..2b2a17da7f 100644
--- a/packages/uboot/u-boot-1.2.0/uboot-qnap.diff
+++ b/packages/u-boot/u-boot-1.2.0/uboot-qnap.diff
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty b/packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch
index d7a2a872e5..d7a2a872e5 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch
index 37b2807908..37b2807908 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch
index fa0de39ab7..fa0de39ab7 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch
index 53a3e05c67..53a3e05c67 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch
index 352967ae06..352967ae06 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/cmd-unzip.patch
index ee4c1984fc..ee4c1984fc 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/cmd-unzip.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/console-ansi.patch
index 2ac5b75dee..2ac5b75dee 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/console-ansi.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/default-env.patch
index b9ae4f29fe..b9ae4f29fe 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/default-env.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/dontask.patch
index 23d4b13626..23d4b13626 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/dontask.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
index cf12352553..cf12352553 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/early-powerdown.patch
index 7326c2daa6..7326c2daa6 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/early-powerdown.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch
index dcb721c8d3..dcb721c8d3 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
index 5a2dd61461..5a2dd61461 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/ext2load_hex.patch
index ff8e9cd6fc..ff8e9cd6fc 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/ext2load_hex.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch
index 715c46ed81..715c46ed81 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch
index fcf54b9fd1..fcf54b9fd1 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-badisbad.patch
index a5800e2499..a5800e2499 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-badisbad.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-createbbt.patch
index 74b79da0a9..74b79da0a9 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-createbbt.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch
index ecce004ca6..ecce004ca6 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch
index b0e9bf4c4b..b0e9bf4c4b 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch
index 8360409e46..8360409e46 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch
index 6f6af2c758..6f6af2c758 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/preboot-override.patch
index f32cbde27b..f32cbde27b 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/preboot-override.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/raise-limits.patch
index a1c381a2cf..a1c381a2cf 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/raise-limits.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/series b/packages/u-boot/u-boot-mkimage-openmoko-native/series
index 4fc7d1342f..4fc7d1342f 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/series
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/series
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/splashimage-command.patch
index 8ea48cf484..8ea48cf484 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/splashimage-command.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
index 7c70244b38..7c70244b38 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
index 343598902f..343598902f 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch
index b39a268c84..b39a268c84 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch
index b3d7bc1166..b3d7bc1166 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch
index 9b1febe956..9b1febe956 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
index 993ef4f6f2..993ef4f6f2 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch
index 349b83697e..349b83697e 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
index 1122f4894f..1122f4894f 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
index ca54ebeff7..ca54ebeff7 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
index f85fdea836..f85fdea836 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch
index 227a97e71a..227a97e71a 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch
index db3cee6e99..db3cee6e99 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch
index a44434155e..a44434155e 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch
index d630889e3c..d630889e3c 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
index 7e3aa4f480..7e3aa4f480 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch
index 19d912620d..19d912620d 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch
index 6efe24651a..6efe24651a 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
index b775beaa07..b775beaa07 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
index dc363bbbab..dc363bbbab 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
index 0d5a49771d..0d5a49771d 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch
index 8cc442a865..8cc442a865 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
index b50853554b..b50853554b 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
index 16bee3e26a..16bee3e26a 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch
index da0fb8cf2d..da0fb8cf2d 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
index 62ae5592ab..62ae5592ab 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
index 09392ad2cf..09392ad2cf 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
index 5757cc078b..5757cc078b 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch
index a88e94b006..a88e94b006 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch
index 722a227aa6..722a227aa6 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch
index 680b301620..680b301620 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch
index 339289699a..339289699a 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch
index 132a9f8da5..132a9f8da5 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch
diff --git a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
index e7812a5ed0..e7812a5ed0 100644
--- a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
+++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb
diff --git a/packages/uboot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty b/packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uboot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty
+++ b/packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty
diff --git a/packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch b/packages/u-boot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch
index f45a1d3aa3..f45a1d3aa3 100644
--- a/packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch
+++ b/packages/u-boot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch
diff --git a/packages/uboot/u-boot-omap2430sdp_1.1.4.bb b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb
index 4dcc989107..4dcc989107 100644
--- a/packages/uboot/u-boot-omap2430sdp_1.1.4.bb
+++ b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb
diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
index 1cee1edf37..1cee1edf37 100644
--- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
+++ b/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb
index 1e59e0746d..550ff5d499 100644
--- a/packages/uboot/uboot-openmoko_svn.bb
+++ b/packages/u-boot/u-boot-openmoko_svn.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 PROVIDES = "virtual/bootloader"
 LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
 PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r2"
 
 SRCREV_FORMAT = "patches"
 
@@ -20,6 +20,7 @@ SRC_URI = "\
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
   file://makefile-no-dirafter.patch;patch=1 \
+  file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 
@@ -27,14 +28,13 @@ EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 TARGET_LDFLAGS = ""
 
 do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        rm -Rf patches .pc
+	mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+	rm -Rf patches .pc
 }
 
 do_svnrev() {
 	mv -f tools/setlocalversion tools/setlocalversion.old
-        echo -n "echo " >>tools/setlocalversion
-	echo ${PV}      >>tools/setlocalversion
+	echo "echo ${LOCALVERSION}" >>tools/setlocalversion
 }
 
 do_configure_prepend() {
@@ -44,27 +44,25 @@ do_configure_prepend() {
 }
 
 do_compile () {
-        chmod +x board/neo1973/gta*/split_by_variant.sh
-        for mach in ${UBOOT_MACHINES}
-        do
-                oe_runmake ${mach}_config
-                oe_runmake clean
-                find board -name lowlevel_foo.bin -exec rm '{}' \;
-                oe_runmake all
-                oe_runmake u-boot.udfu
-                if [ -f u-boot.udfu ]; then
-                        mv u-boot.udfu u-boot_${mach}.bin
-                else
-                        mv u-boot.bin u-boot_${mach}.bin
-                fi
-                if [ -f board/${mach}/lowlevel_foo.bin ]; then
-                        mv board/${mach}/lowlevel_foo.bin \
-                            lowlevel_foo_${mach}.bin
-                else
-                        find board -name lowlevel_foo.bin \
-                            -exec mv '{}' lowlevel_foo_${mach}.bin \;
-                fi
-        done
+	chmod +x board/neo1973/gta*/split_by_variant.sh
+	for mach in ${UBOOT_MACHINES}
+	do
+		oe_runmake ${mach}_config
+		oe_runmake clean
+		find board -name lowlevel_foo.bin -exec rm '{}' \;
+		oe_runmake all
+		oe_runmake u-boot.udfu
+		if [ -f u-boot.udfu ]; then
+			mv u-boot.udfu u-boot_${mach}.bin
+		else
+			mv u-boot.bin u-boot_${mach}.bin
+		fi
+		if [ -f board/${mach}/lowlevel_foo.bin ]; then
+			mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
+		else
+			find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \;
+		fi
+	done
 }
 
 do_deploy () {
diff --git a/packages/uboot/u-boot-utils-native_1.2.0.bb b/packages/u-boot/u-boot-utils-native_1.2.0.bb
index b04b366ffe..b04b366ffe 100644
--- a/packages/uboot/u-boot-utils-native_1.2.0.bb
+++ b/packages/u-boot/u-boot-utils-native_1.2.0.bb
diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/u-boot/u-boot-utils_1.2.0.bb
index 1734b41a0e..1734b41a0e 100644
--- a/packages/uboot/u-boot-utils_1.2.0.bb
+++ b/packages/u-boot/u-boot-utils_1.2.0.bb
diff --git a/packages/uboot/u-boot.inc b/packages/u-boot/u-boot.inc
index 9f7356d5d7..9f7356d5d7 100644
--- a/packages/uboot/u-boot.inc
+++ b/packages/u-boot/u-boot.inc
diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb
index 82b169ccc4..82b169ccc4 100644
--- a/packages/uboot/u-boot_1.1.2.bb
+++ b/packages/u-boot/u-boot_1.1.2.bb
diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/u-boot/u-boot_1.1.4.bb
index 7a92b57c34..7a92b57c34 100644
--- a/packages/uboot/u-boot_1.1.4.bb
+++ b/packages/u-boot/u-boot_1.1.4.bb
diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/u-boot/u-boot_1.1.6.bb
index e003c69d7b..e003c69d7b 100644
--- a/packages/uboot/u-boot_1.1.6.bb
+++ b/packages/u-boot/u-boot_1.1.6.bb
diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/u-boot/u-boot_1.2.0.bb
index f1075bb00b..f1075bb00b 100644
--- a/packages/uboot/u-boot_1.2.0.bb
+++ b/packages/u-boot/u-boot_1.2.0.bb
diff --git a/packages/uboot/u-boot_1.3.0.bb b/packages/u-boot/u-boot_1.3.0.bb
index 2886ddecc8..2886ddecc8 100644
--- a/packages/uboot/u-boot_1.3.0.bb
+++ b/packages/u-boot/u-boot_1.3.0.bb
diff --git a/packages/uboot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb
index 60ab0ab3f6..60ab0ab3f6 100644
--- a/packages/uboot/u-boot_git.bb
+++ b/packages/u-boot/u-boot_git.bb