From 15eb52b7af1bf60ffea23a777a290ae43e5dae62 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Tue, 10 Apr 2012 10:54:11 +0800 Subject: [PATCH] fix u-boot-nand build error of non-dpaa targets u-boot-nand doesn't need to be handled by boot-format Signed-off-by: Zhenhua Luo --- meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb index decb6ec1..5060741b 100644 --- a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb +++ b/meta-fsl-ppc/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 = "r13" +PR = "r14" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc" @@ -54,7 +54,8 @@ do_compile () { [ "${MACHINE_ARCH}" == "p3041ds" ] || \ [ "${MACHINE_ARCH}" == "p3060qds" ] || \ [ "${MACHINE_ARCH}" == "p4080ds" ] || \ - [ "${MACHINE_ARCH}" == "p5020ds" ]; then + [ "${MACHINE_ARCH}" == "p5020ds" ] || \ + [ "${UBOOT_TARGET}" == "u-boot-nand" ]; then cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin else ${STAGING_BINDIR_NATIVE}/boot_format \ -- 2.40.1