From 6f19d6a79ae5a6bf9f249e821a8781e2ecb053a9 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Mon, 21 May 2012 17:12:36 +0000 Subject: fix the u-boot-nand build issue u-boot-nand.bin is the right one for NAND flash instead lf u-boot.bin Signed-off-by: Zhenhua Luo --- recipes-kernel/u-boot/u-boot_git.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb index 3d42aa8..fbb99bc 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 = "r16" +PR = "r17" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc" @@ -49,13 +49,14 @@ do_compile () { esac if [ "x${UBOOT_TARGET}" != "x" ]; then - if [ "${MACHINE_ARCH}" == "p1023rds" ] || \ + 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" ] || \ - [ "${UBOOT_TARGET}" == "u-boot-nand" ]; then + [ "${UBOOT_TARGET}" == "u-boot-sd" ]; then cp ${S}/${board}/u-boot.bin ${S}/${board}/${UBOOT_TARGET}.bin else ${STAGING_BINDIR_NATIVE}/boot_format \ -- cgit v1.2.3-54-g00ecf