From: Ting Liu <b28495@freescale.com>
Date: Fri, 20 Apr 2012 10:11:21 +0000 (+0000)
Subject: u-boot-sd: skip using boot-format to regenerate images
X-Git-Tag: 2.1~534^2~474
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=161947b736c04059945773b362b88bbea82afec3;p=meta-freescale.git

u-boot-sd: skip using boot-format to regenerate images

u-boot images can be deployed to SD using boot-format on target
board. This method can leave the SD partition not destoryed.

For bug ENGR179814.

Signed-off-by: Ting Liu <b28495@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 5060741b..1b256dad 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 = "r14"
+PR = "r15"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc"
 
@@ -55,6 +55,7 @@ do_compile () {
 			        [ "${MACHINE_ARCH}" == "p3060qds" ] || \
         	                [ "${MACHINE_ARCH}" == "p4080ds" ] || \
                 	        [ "${MACHINE_ARCH}" == "p5020ds" ] || \
+                	        [ "${UBOOT_TARGET}" == "u-boot-sd" ] || \
 				[ "${UBOOT_TARGET}" == "u-boot-nand" ]; then
 				cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
 			else