From: Zhenhua Luo <b19537@freescale.com>
Date: Tue, 10 Apr 2012 02:54:11 +0000 (+0800)
Subject: fix u-boot-nand build error of non-dpaa targets
X-Git-Tag: 2.1~534^2~483
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=15eb52b7af1bf60ffea23a777a290ae43e5dae62;p=meta-freescale.git

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 <b19537@freescale.com>
---

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 \