[Armadeus-commitlog] SF.net SVN: armadeus:[883] branches/apf2/buildroot/target/device/armadeus/ u-boot/u-boot.mk

[<jo...@us...>]

Revision: 883
          http://armadeus.svn.sourceforge.net/armadeus/?rev=883&view=rev
Author:   jorasse
Date:     2008-09-13 10:08:51 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
[u-boot] added NAND bootloader (SPL) : uboot-nand.bin

Modified Paths:
--------------
    branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk

Modified: branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk
===================================================================
--- branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk	2008-09-12 13:09:49 UTC (rev 882)
+++ branches/apf2/buildroot/target/device/armadeus/u-boot/u-boot.mk	2008-09-13 10:08:51 UTC (rev 883)
@@ -22,7 +22,7 @@
 U-BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U-BOOT_VERSION)
 #U-BOOT_TARGET_NAME:=pcm038 # overloaded by ../apf27/Makefile.in
 U-BOOT_UNZIP:=bzcat
-U-BOOT_GENERATED_BIN:=u-boot.bin
+U-BOOT_GENERATED_BIN:=u-boot-nand.bin
 ADDITIONAL_MAKE_PARAMETERS:=CONFIG_NOSOFTFLOAT=1 ARCH=arm
 U-BOOT_TARGET_CONFIG=$(U-BOOT_TARGET_NAME)_config
 
@@ -129,13 +129,16 @@
 	cp $^ $@
 
 ###-----
+ifneq ($(BR2_TARGET_ARMADEUS_APF27),)
+u-boot: $(BINARIES_DIR)/u-boot.bin
+else
 u-boot: $(BINARIES_DIR)/u-boot.bin $(BINARIES_DIR)/u-boot.brec
+endif
 ifneq ($(BR2_TARGET_U-BOOT_NG),)
 	ln -fs $(U-BOOT_DIR)/scripts/mkimage $(STAGING_DIR)/bin/mkimage
 else #U-BOOT 1.x
 	ln -fs $(U-BOOT_DIR)/tools/mkimage $(STAGING_DIR)/bin/mkimage
 endif
-
 ###-----
 u-boot-clean:
 	make -C $(U-BOOT_DIR) clean


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.