diff options
author | Graeme Gregory <dp@xora.org.uk> | 2008-02-26 16:22:45 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2008-02-26 16:22:45 +0000 |
commit | 4b254d931ebdb10e9d874108d3c88bc52fc6f6f5 (patch) | |
tree | f80d0f81bef4fa0624e9c61be3f37798d105367f | |
parent | 742fc8adde250d069d21bac9c663c25b1629444b (diff) | |
parent | 271935c586a9af040c2fa1ecaacf54c9fcd5e0a2 (diff) |
merge of 'bb3a350cb54c9fb4c228cbda61641d9fce41e303'
and 'ff93c9e7d2875781e7af90b2d3588461fb232fb4'
-rw-r--r-- | packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 14 |
1 files changed, 7 insertions, 7 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..737cf8ef0c 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() { |