[oe-commits] org.oe.dev u-boot-openmoko: update to newer version of upstream and OM patchset

[john_lee commit]

u-boot-openmoko: update to newer version of upstream and OM patchset
* add machine gta02v5
* remove do_configure_prepend because it's no longer necessary
* not applying makefile-no-dirafter.patch for now
* not applying fix-data-abort-from-sd-ombug799.patch for now

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 7d76e5a73f9dadfcf85543e62ab68ee014c0cbf9
ViewMTN: http://monotone.openembedded.org/revision/info/7d76e5a73f9dadfcf85543e62ab68ee014c0cbf9
Files:
1
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Diffs:

#
# mt diff -r39cb8f9a35e4a88e86155c1452324b57eb0e575e -r7d76e5a73f9dadfcf85543e62ab68ee014c0cbf9
#
#
#
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#  from [5906c2607fc6aca5a48fa0b21942c425013f9722]
#    to [4bc40cd7ec2d5d6dc069c8bb37b5f47fe57b9d2b]
#
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	5906c2607fc6aca5a48fa0b21942c425013f9722
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	4bc40cd7ec2d5d6dc069c8bb37b5f47fe57b9d2b
@@ -4,12 +4,12 @@ PRIORITY = "optional"
 SECTION = "bootloader"
 PRIORITY = "optional"
 
-UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89"
-UBOOT_OPENMOKO_REV = "3817"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4"
+UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
+UBOOT_OPENMOKO_REV = "4047"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
 LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
 PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r2"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
@@ -18,11 +18,11 @@ SRC_URI = "\
   git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
-  file://makefile-no-dirafter.patch;patch=1 \
-  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+#  file://makefile-no-dirafter.patch;patch=1 \
+#  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
 "
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
 TARGET_LDFLAGS = ""
 
 do_quilt() {
@@ -35,12 +35,6 @@ do_svnrev() {
 	echo "echo ${LOCALVERSION}" >>tools/setlocalversion
 }
 
-do_configure_prepend() {
-	find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
-	find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
-	cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
-}
-
 do_compile () {
         chmod +x board/neo1973/gta*/split_by_variant.sh
         for mach in ${UBOOT_MACHINES}