--- u-boot-openmoko_1.3.1+git+svn.bb	2008-05-04 17:52:48.000000000 -0700
+++ u-boot-openmoko_head.bb	2008-05-04 18:37:20.000000000 -0700
@@ -3,21 +3,24 @@
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
+DEFAULT_PREFERENCE = "-1"
 
-UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8"
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
 SRCREV_FORMAT = "patchset"
 
-PV = "1.3.1+svnr${SRCREV}+git${UBOOT_UPSTREAM_REV}"
-PR = "r3"
+LOCALVERSION = "+svnr${SRCREV}+git${SRCDATE}"
+PV = "1.3.3pre${LOCALVERSION}"
+PR = "r0"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
 
 SRC_URI = "\
-  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \
+  git://www.denx.de/git/u-boot.git;protocol=git;name=upstream \
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \
-  file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+  file://int_rtc_get.patch;patch=1 \
+  file://revert_git_de109d90.patch;patch=1 \
 "
 
 EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"