summaryrefslogtreecommitdiff
path: root/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2008-03-02 19:55:55 +0000
committerThomas Kunze <thommycheck@gmx.de>2008-03-02 19:55:55 +0000
commit0e96be7f834f3264594c8e21b3fe5ee69c296486 (patch)
tree0430eb0baac708cbd7dbfbf24f00fcb64219d29b /packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
parent2a98e2a2c1b55a0eb0ac09f2f9b55db2e4c23553 (diff)
parentbd607171760c733930b955f591e156717651fc1f (diff)
merge of '16882b53b725e8d7bfbf2d2909cfbf1f3a8a90fc'
and '55956ba3628054539f1f1f6c44ab7108d48f8b32'
Diffstat (limited to 'packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb')
-rw-r--r--packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb20
1 files changed, 7 insertions, 13 deletions
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
index 7a9800f94a..020fd421c6 100644
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
@@ -4,12 +4,12 @@ LICENSE = "GPL"
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 = "4118"
+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 = "r3"
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}