[OE-core] [PATCH 2/2] u-boot.inc : add compile multiple u-boot feature

[Otavio Salvador]

On Thu, Nov 20, 2014 at 8:06 AM, Chunrong Guo <B40290 at freescale.com> wrote:
> Signed-off-by: Chunrong Guo <B40290 at freescale.com>
> ---
>  meta/recipes-bsp/u-boot/u-boot.inc | 42 ++++++++++++++------------------------
>  1 file changed, 15 insertions(+), 27 deletions(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index c695b73..f420061 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -24,6 +24,7 @@ UBOOT_LOCALVERSION ?= ""
>  # Some versions of u-boot use .bin and others use .img.  By default use .bin
>  # but enable individual recipes to change this value.
>  UBOOT_SUFFIX ??= "bin"
> +UBOOT_DEF_IMAGE ?= ""
>  UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
>  UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
>  UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
> @@ -33,9 +34,6 @@ UBOOT_MAKE_TARGET ?= "all"
>  # should be packaged along with the u-boot binary as well as placed in the
>  # deploy directory.  For those versions they can set the following variables
>  # to allow packaging the SPL.
> -SPL_BINARY ?= ""
> -SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
> -SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
>
>  # Additional environment variables or a script can be installed alongside
>  # u-boot to be used automatically on boot.  This file, typically 'uEnv.txt'
> @@ -63,25 +61,25 @@ do_compile () {
>                 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
>         fi
>
> -       oe_runmake ${UBOOT_MACHINE}
> -       oe_runmake ${UBOOT_MAKE_TARGET}
> +
> +    for type in ${UBOOT_MACHINE}; do
> +           oe_runmake O=${type} ${type}
> +           oe_runmake O=${type} ${UBOOT_MAKE_TARGET}
> +        cp  ${S}/${type}/${UBOOT_BINARY}  ${S}/${type}/u-boot-${type}.bin
> +    done

You are mixing indenting levels here; please fix.

>  }
>
>  do_install () {
> -    install -d ${D}/boot
> -    install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
> -    ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>
> +    for type in ${UBOOT_MACHINE}; do
> +        install -d ${D}/boot
> +        install ${S}/${type}/u-boot-${type}.bin ${D}/boot/u-boot-${type}.bin
> +    done
>      if [ -e ${WORKDIR}/fw_env.config ] ; then
>          install -d ${D}${sysconfdir}
>          install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
>      fi
>
> -    if [ "x${SPL_BINARY}" != "x" ]
> -    then
> -        install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
> -        ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
> -    fi

You seem to have broken the SPL support here.

>      if [ "x${UBOOT_ENV}" != "x" ]
>      then
> @@ -93,21 +91,11 @@ do_install () {
>  FILES_${PN} = "/boot ${sysconfdir}"
>
>  do_deploy () {
> -    install -d ${DEPLOYDIR}
> -    install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
>
> -    cd ${DEPLOYDIR}
> -    rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
> -    ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
> -    ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
> -
> -    if [ "x${SPL_BINARY}" != "x" ]
> -    then
> -        install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
> -        rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
> -        ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
> -        ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
> -    fi
> +    for type in ${UBOOT_MACHINE}; do
> +        install -d ${DEPLOYDIR}
> +        install ${S}/${type}/u-boot-${type}.bin ${DEPLOYDIR}/u-boot-${type}.bin
> +    done
>
>      if [ "x${UBOOT_ENV}" != "x" ]
>      then
> --
> 1.9.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750