Patchwork [2/4] uboot: Update to 2011.06

login
register
mail settings
Submitter Saul Wold
Date July 1, 2011, 6:54 a.m.
Message ID <1b743a32b4fc3ccdea5ebbb94691d6441bdd706a.1309503004.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/6793/
State New, archived
Headers show

Comments

Saul Wold - July 1, 2011, 6:54 a.m.
[YOCTO #1198]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 ...Drop-config.h-include-in-tools-imximage.h.patch |    0
 ...ove-LDSCRIPT-processing-to-the-top-level-.patch |    0
 ...kimage_2011.03.bb => u-boot-mkimage_2011.06.bb} |   12 +++++-------
 .../uboot/{u-boot_2011.03.bb => u-boot_2011.06.bb} |   10 +++++-----
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename meta/recipes-bsp/uboot/{u-boot-mkimage-2011.03 => u-boot-mkimage-2011.06}/0001-Drop-config.h-include-in-tools-imximage.h.patch (100%)
 rename meta/recipes-bsp/uboot/{u-boot-mkimage-2011.03 => u-boot-mkimage-2011.06}/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch (100%)
 rename meta/recipes-bsp/uboot/{u-boot-mkimage_2011.03.bb => u-boot-mkimage_2011.06.bb} (51%)
 rename meta/recipes-bsp/uboot/{u-boot_2011.03.bb => u-boot_2011.06.bb} (74%)
Koen Kooi - July 1, 2011, 7:16 a.m.
Op 1 jul 2011, om 08:54 heeft Saul Wold het volgende geschreven:

> [YOCTO #1198]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> ...Drop-config.h-include-in-tools-imximage.h.patch |    0
> ...ove-LDSCRIPT-processing-to-the-top-level-.patch |    0
> ...kimage_2011.03.bb => u-boot-mkimage_2011.06.bb} |   12 +++++-------
> .../uboot/{u-boot_2011.03.bb => u-boot_2011.06.bb} |   10 +++++-----

You do realize that people .bbappending 2011.03 are now left out in the cold, right?
Darren Hart - July 8, 2011, 4:09 p.m.
On 07/01/2011 12:16 AM, Koen Kooi wrote:
> 
> Op 1 jul 2011, om 08:54 heeft Saul Wold het volgende geschreven:
> 
>> [YOCTO #1198]
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>> ---
>> ...Drop-config.h-include-in-tools-imximage.h.patch |    0
>> ...ove-LDSCRIPT-processing-to-the-top-level-.patch |    0
>> ...kimage_2011.03.bb => u-boot-mkimage_2011.06.bb} |   12 +++++-------
>> .../uboot/{u-boot_2011.03.bb => u-boot_2011.06.bb} |   10 +++++-----
> 
> You do realize that people .bbappending 2011.03 are now left out in the cold, right?

My apologies to Saul as I probably contributed to this by not being
explicit in the bug report. As stated in my earlier mail regarding uboot
policy, we should keep at least two revisions of u-boot around to give
people time to migrate to the newer one (if they can at all).

Patch

diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.06/0001-Drop-config.h-include-in-tools-imximage.h.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
rename to meta/recipes-bsp/uboot/u-boot-mkimage-2011.06/0001-Drop-config.h-include-in-tools-imximage.h.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/uboot/u-boot-mkimage-2011.06/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
rename to meta/recipes-bsp/uboot/u-boot-mkimage-2011.06/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage_2011.03.bb b/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
similarity index 51%
rename from meta/recipes-bsp/uboot/u-boot-mkimage_2011.03.bb
rename to meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
index 34bae8e..6f2a2ca 100644
--- a/meta/recipes-bsp/uboot/u-boot-mkimage_2011.03.bb
+++ b/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
@@ -1,17 +1,15 @@ 
 DESCRIPTION = "U-boot bootloader mkimage tool"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
-                    file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5"
+                    file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
 SECTION = "bootloader"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
-           file://0001-Drop-config.h-include-in-tools-imximage.h.patch \
-           file://0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch"
+SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "91d02124c94368557d0e9ac05fb8c33f"
-SRC_URI[sha256sum] = "08677f66d8d4ee542f6599f580cdffdf730544e1803f9d3739117d6f6d68083e"
+SRC_URI[md5sum] = "0cc5026aad02f218a9b9ac56b301c97a"
+SRC_URI[sha256sum] = "362ddb935885da98cf461eba08f31e3e59d0c4ada6cb2fa15596f43af310ba8b"
 
 S = "${WORKDIR}/u-boot-${PV}"
 
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/uboot/u-boot_2011.06.bb
similarity index 74%
rename from meta/recipes-bsp/uboot/u-boot_2011.03.bb
rename to meta/recipes-bsp/uboot/u-boot_2011.06.bb
index 34655ea..acd0944 100644
--- a/meta/recipes-bsp/uboot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/uboot/u-boot_2011.06.bb
@@ -8,16 +8,16 @@  require u-boot.inc
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
-                    file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5"
+                    file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-git/${MACHINE}"
 
-# This revision corresponds to the tag "v2011.03"
+# This revision corresponds to the tag "v2011.06"
 # We use the revision in order to avoid having to fetch it from the repo during parse
-SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca"
+SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
 
-PV = "v2011.03+git${SRCPV}"
-PR = "r5"
+PV = "v2011.06+git${SRCPV}"
+PR = "r0"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"