Patchwork u-boot: Upgrade to upstream stable 2012.07

login
register
mail settings
Submitter Radu Moisan
Date Aug. 6, 2012, 6:54 a.m.
Message ID <1344236047-28547-1-git-send-email-radu.moisan@intel.com>
Download mbox | patch
Permalink /patch/33961/
State New
Headers show

Comments

Radu Moisan - Aug. 6, 2012, 6:54 a.m.
For u-boot-fw-utils, fw_enc.c was changed and it requires a header
file config.h which is autogenerated at config so it requires a
"make NAME_config".
I used for testing coreboot-x86.

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 ...ls_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} |    7 ++++---
 ...age_2012.04.01.bb => u-boot-mkimage_2012.07.bb} |    6 +++---
 .../{u-boot_2012.04.01.bb => u-boot_2012.07.bb}    |    8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} (83%)
 rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2012.04.01.bb => u-boot-mkimage_2012.07.bb} (84%)
 rename meta/recipes-bsp/u-boot/{u-boot_2012.04.01.bb => u-boot_2012.07.bb} (82%)
Martin Jansa - Aug. 6, 2012, 6:55 a.m.
On Mon, Aug 06, 2012 at 09:54:07AM +0300, Radu Moisan wrote:
> For u-boot-fw-utils, fw_enc.c was changed and it requires a header
> file config.h which is autogenerated at config so it requires a
> "make NAME_config".
> I used for testing coreboot-x86.

Is build with gold resolved in this new release already? By forcing bfd
or to provide working binaries when built with gold?

More info:
http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026943.html

Cheers,

> 
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> ---
>  ...ls_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} |    7 ++++---
>  ...age_2012.04.01.bb => u-boot-mkimage_2012.07.bb} |    6 +++---
>  .../{u-boot_2012.04.01.bb => u-boot_2012.07.bb}    |    8 ++++----
>  3 files changed, 11 insertions(+), 10 deletions(-)
>  rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2012.04.01.bb => u-boot-fw-utils_2012.07.bb} (83%)
>  rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2012.04.01.bb => u-boot-mkimage_2012.07.bb} (84%)
>  rename meta/recipes-bsp/u-boot/{u-boot_2012.04.01.bb => u-boot_2012.07.bb} (82%)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
> similarity index 83%
> rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb
> rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
> index fe3422a..d2224bb 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
> @@ -9,12 +9,12 @@ DEPENDS = "mtd-utils"
>  # make it default
>  DEFAULT_PREFERENCE = "-1"
>  
> -# This revision corresponds to the tag "v2012.04.01"
> +# This revision corresponds to the tag "v2012.07"
>  # We use the revision in order to avoid having to fetch it from the
>  # repo during parse
> -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
> +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
>  
> -PV = "v2012.04.01+git${SRCPV}"
> +PV = "2012.07"
>  
>  SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>  
> @@ -23,6 +23,7 @@ S = "${WORKDIR}/git"
>  EXTRA_OEMAKE = 'HOSTCC="${CC}"'
>  
>  do_compile () {
> +  oe_runmake ${UBOOT_MACHINE}
>    oe_runmake env
>  }
>  
> diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
> similarity index 84%
> rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb
> rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
> index aa107fe..752efcb 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
> @@ -7,12 +7,12 @@ SECTION = "bootloader"
>  # make it default
>  DEFAULT_PREFERENCE = "-1"
>  
> -# This revision corresponds to the tag "v2012.04.01"
> +# This revision corresponds to the tag "v2012.07"
>  # We use the revision in order to avoid having to fetch it from the
>  # repo during parse
> -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
> +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
>  
> -PV = "v2012.04.01+git${SRCPV}"
> +PV = "2012.07"
>  
>  SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>  
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb
> similarity index 82%
> rename from meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
> rename to meta/recipes-bsp/u-boot/u-boot_2012.07.bb
> index c4ec50d..7ccee30 100644
> --- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb
> @@ -14,13 +14,13 @@ DEFAULT_PREFERENCE = "-1"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
>  
> -# This revision corresponds to the tag "v2012.04.01"
> +# This revision corresponds to the tag "v2012.07"
>  # We use the revision in order to avoid having to fetch it from the
>  # repo during parse
> -SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
> +SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
>  
> -PV = "v2012.04.01+git${SRCPV}"
> -PR = "r1"
> +PV = "2012.07"
> +PR = "r0"
>  
>  SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Radu Moisan - Aug. 6, 2012, 7:12 a.m.
On 08/06/2012 09:55 AM, Martin Jansa wrote:
> On Mon, Aug 06, 2012 at 09:54:07AM +0300, Radu Moisan wrote:
>> For u-boot-fw-utils, fw_enc.c was changed and it requires a header
>> file config.h which is autogenerated at config so it requires a
>> "make NAME_config".
>> I used for testing coreboot-x86.
> Is build with gold resolved in this new release already? By forcing bfd
> or to provide working binaries when built with gold?
>
> More info:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026943.html
I don't know what linker is used, I guess the default one. If you can 
point out to me how to check, I'll be glad to do it.
The patch in your link was not in my tree at the time I've tested, if 
that is relevant in any way.

thanks,
radu
Martin Jansa - Aug. 6, 2012, 7:19 a.m.
On Mon, Aug 06, 2012 at 10:12:20AM +0300, Radu Moisan wrote:
> 
> On 08/06/2012 09:55 AM, Martin Jansa wrote:
> > On Mon, Aug 06, 2012 at 09:54:07AM +0300, Radu Moisan wrote:
> >> For u-boot-fw-utils, fw_enc.c was changed and it requires a header
> >> file config.h which is autogenerated at config so it requires a
> >> "make NAME_config".
> >> I used for testing coreboot-x86.
> > Is build with gold resolved in this new release already? By forcing bfd
> > or to provide working binaries when built with gold?
> >
> > More info:
> > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-August/026943.html

> I don't know what linker is used, I guess the default one. If you can 
> point out to me how to check, I'll be glad to do it.
> The patch in your link was not in my tree at the time I've tested, if 
> that is relevant in any way.

Maybe you were looking to poky repo instead of oe-core?

Find poky equivalent of
http://git.openembedded.org/openembedded-core/commit/?id=2e79fcd673dadeab6358fe22d47c8534c14de03e

The issue reported in that email was fixed
http://git.openembedded.org/openembedded-core/commit/?id=f78044f85ab1a0acce852a7032fc0c81285cd4c1

What I was intereseted is whether upstream added similar patch to
http://git.shr-project.org/git/?p=meta-smartphone.git;a=blob;f=meta-nokia/recipes-bsp/u-boot/u-boot/0001-config-Always-use-GNU-ld.patch
or added other fix to make gold usable for u-boot.

And you can test build with gold if you enable gold by adding ld-is-gold
to DISTRO_FEATURES.

Cheers,

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
similarity index 83%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
index fe3422a..d2224bb 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.04.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2012.07.bb
@@ -9,12 +9,12 @@  DEPENDS = "mtd-utils"
 # make it default
 DEFAULT_PREFERENCE = "-1"
 
-# This revision corresponds to the tag "v2012.04.01"
+# This revision corresponds to the tag "v2012.07"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
+SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
 
-PV = "v2012.04.01+git${SRCPV}"
+PV = "2012.07"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
 
@@ -23,6 +23,7 @@  S = "${WORKDIR}/git"
 EXTRA_OEMAKE = 'HOSTCC="${CC}"'
 
 do_compile () {
+  oe_runmake ${UBOOT_MACHINE}
   oe_runmake env
 }
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
similarity index 84%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
index aa107fe..752efcb 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.04.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2012.07.bb
@@ -7,12 +7,12 @@  SECTION = "bootloader"
 # make it default
 DEFAULT_PREFERENCE = "-1"
 
-# This revision corresponds to the tag "v2012.04.01"
+# This revision corresponds to the tag "v2012.07"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
+SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
 
-PV = "v2012.04.01+git${SRCPV}"
+PV = "2012.07"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb
similarity index 82%
rename from meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
rename to meta/recipes-bsp/u-boot/u-boot_2012.07.bb
index c4ec50d..7ccee30 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2012.07.bb
@@ -14,13 +14,13 @@  DEFAULT_PREFERENCE = "-1"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-# This revision corresponds to the tag "v2012.04.01"
+# This revision corresponds to the tag "v2012.07"
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
+SRCREV = "190649fb4309d1bc0fe7732fd0f951cb6440f935"
 
-PV = "v2012.04.01+git${SRCPV}"
-PR = "r1"
+PV = "2012.07"
+PR = "r0"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"