Re: [PATCH][RFC] u-boot: Upgrade to upstream stable 2012.07

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 6608 bytes --]

On Fri, Aug 03, 2012 at 03:38:42PM +0300, Radu Moisan wrote:
> Building u-boot requires UBOOT_MACHINE. In the u-boot README file
> building u-boot is achieved with "make NAME_config" and then
> "make all". I assumend UBOOT_MACHINE to be the "NAME" part and thus,
> the "_config" addition in u-boot.inc
> NAME is the machine name, and choices area vailable in boards.conf,
> I used for testing coreboot-x86.

From this description I don't see why _config is now appended when
probably all BSPs had it included in UBOOT_MACHINE variable before

meta-nokia/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_nokia900 = "nokia_rx51_config"
meta-openmoko/conf/machine/om-gta04.conf:UBOOT_MACHINE = "omap3_gta04_config"
meta-openmoko/recipes-bsp/u-boot/u-boot_git.bb:UBOOT_MACHINE_om-gta04 = "omap3_gta04_config"
conf/machine/am180x-evm.conf:UBOOT_MACHINE = "da850evm_config"
conf/machine/am335x-evm.conf:UBOOT_MACHINE = "am335x_evm_config"
conf/machine/am3517-evm.conf:UBOOT_MACHINE = "am3517_evm_config"
conf/machine/am37x-evm.conf:UBOOT_MACHINE = "omap3_evm_config"
conf/machine/beagleboard.conf:UBOOT_MACHINE = "omap3_beagle_config"
conf/machine/beaglebone.conf:UBOOT_MACHINE = "am335x_evm_config"
conf/machine/hawkboard.conf:UBOOT_MACHINE = "da850_omapl138_evm_config"
conf/machine/include/davinci.inc:UBOOT_MACHINE = "davinci_dvevm_config"
conf/machine/include/ti814x.inc:UBOOT_MACHINE = "ti8148_evm_config_nand"
conf/machine/include/ti816x.inc:UBOOT_MACHINE = "ti8168_evm_config"
conf/machine/omap3-touchbook.conf:UBOOT_MACHINE = "omap3_beagle_config"
conf/machine/omap3evm.conf:UBOOT_MACHINE = "omap3_evm_config"
conf/machine/pandaboard.conf:UBOOT_MACHINE = "omap4_panda_config"

And any sensible is to append it to *MACHINE* variable as default:
recipes-bsp/u-boot/u-boot.inc:UBOOT_MACHINE ?= "${MACHINE}_config"

Cheers,

> 
> 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".
> 
> 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 +++---
>  meta/recipes-bsp/u-boot/u-boot.inc                 |    2 +-
>  .../{u-boot_2012.04.01.bb => u-boot_2012.07.bb}    |    8 ++++----
>  4 files changed, 12 insertions(+), 11 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..2fa3b71 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}_config
>    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.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index 42bdde9..58a8192 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -40,7 +40,7 @@ do_compile () {
>  	unset LDFLAGS
>  	unset CFLAGS
>  	unset CPPFLAGS
> -	oe_runmake ${UBOOT_MACHINE}
> +	oe_runmake ${UBOOT_MACHINE}_config
>  	oe_runmake ${UBOOT_MAKE_TARGET}
>  }
>  
> 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

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]