[meta-freescale] [PATCH 01/27] u-boot: fix nand image name issue for different core type

[Matthew McClintock]

From: Zhenhua Luo <b19537 at 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 <b19537 at freescale.com>
Signed-off-by: Ting Liu <b28495 at freescale.com>
---
 recipes-kernel/u-boot/u-boot_git.bb |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb
index c0de2ec..207a6ff 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 = "r26"
+PR = "r27"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc libgcc"
 
@@ -69,18 +69,20 @@ do_compile () {
 		esac
 
 		if [ "x${UBOOT_TARGET}" != "x" ]; then
-			if [ "${MACHINE_ARCH}" == "p1023rds" ] || \
-				[ "${MACHINE_ARCH}" == "p2041rdb" ] || \
-	                        [ "${MACHINE_ARCH}" == "p3041ds" ] || \
-        	                [ "${MACHINE_ARCH}" == "p4080ds" ] || \
-                	        [ "${MACHINE_ARCH}" == "p5020ds" ] || \
-                	        [ "${UBOOT_TARGET}" == "u-boot-sd" ] || \
-				[ "${UBOOT_TARGET}" == "u-boot-nand" ]; 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.7