On Wed, Sep 12, 2012 at 2:06 AM, <b19...@freescale.com> wrote:
> From: Zhenhua Luo <b19...@freescale.com>
>
> Final nand u-boot image is named differently in u-boot source. That is:
> "u-boot-nand.bin" for e500v2 boards, "u-boot.bin" for other boards.
>
> Signed-off-by: Zhenhua Luo <b19...@freescale.com>
> Signed-off-by: Ting Liu <b28...@freescale.com>
This is not applying against master.
-M
> ---
> recipes-kernel/u-boot/u-boot_git.bb | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/recipes-kernel/u-boot/u-boot_git.bb
> b/recipes-kernel/u-boot/u-boot_git.bb
> index 38d0574..898cd7a 100644
> --- a/recipes-kernel/u-boot/u-boot_git.bb
> +++ b/recipes-kernel/u-boot/u-boot_git.bb
> @@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
>
> -PR = "r19"
> +PR = "r21"
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
>
> @@ -49,19 +49,20 @@ do_compile () {
> esac
>
> if [ "x${UBOOT_TARGET}" != "x" ]; then
> - if [ "${UBOOT_TARGET}" == "u-boot-nand" ]; then
> - :
> - elif [ "${MACHINE_ARCH}" == "p1023rds" ] || \
> - [ "${MACHINE_ARCH}" == "p2041rdb" ] || \
> - [ "${MACHINE_ARCH}" == "p3041ds" ] || \
> - [ "${MACHINE_ARCH}" == "p4080ds" ] || \
> - [ "${MACHINE_ARCH}" == "p5020ds" ] || \
> - [ "${UBOOT_TARGET}" == "u-boot-sd" ]; then
> + if [ "${UBOOT_TARGET}" == "u-boot-sd" ]; then
> cp ${S}/${board}/u-boot.bin
> ${S}/${board}/${UBOOT_TARGET}.bin
> + elif [ "${UBOOT_TARGET}" == "u-boot-nand" ];then
> + if [ "${DEFAULTTUNE}" != "ppce500v2" ];then
> + cp ${S}/${board}/u-boot.bin
> ${S}/${board}/${UBOOT_TARGET}.bin
> + fi
> else
> - ${STAGING_BINDIR_NATIVE}/boot_format \
> + if [ -n "${BOOTFORMAT_CONFIG}" ];then
> + ${STAGING_BINDIR_NATIVE}/boot_format \
>
> ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
> ${S}/${board}/u-boot.bin -spi
> ${S}/${board}/${UBOOT_TARGET}.bin
> + else
> + cp ${S}/${board}/u-boot.bin
> ${S}/${board}/${UBOOT_TARGET}.bin
> + fi
> fi
> fi
> done
> --
> 1.7.9.5
>
>
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
