[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-105-g39c6c62

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  39c6c62359e23326d49e4fe7ffab241c2a3e1e66 (commit)
       via  3918c0fad042c57ff453f7fed050525ae2ff7f8a (commit)
      from  d6af2da0a6c1eb8cf70fcb2d90488c12bed6a142 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39c6c62359e23326d49e4fe7ffab241c2a3e1e66
Merge: 3918c0f d6af2da
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 7 17:26:17 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 3918c0fad042c57ff453f7fed050525ae2ff7f8a
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 7 17:25:41 2012 +0100

    [BUILDROOT] Fix U-Boot compilation issue for both BR2011.05 and BR2012.02

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index db1ba66..ee777c3 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -3,22 +3,18 @@ ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
 ARMADEUS_PATH:=target/device/armadeus
 BOARD_NAME:=$(call qstrip,$(BR2_BOARD_NAME))
 BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
+CPU_NAME:=$(call qstrip,$(BR2_CPU_NAME))
 
 ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
 # for old BR:
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
-# U-Boot variables overloading:
-#  old BR (U_BOOT_BIN):
 U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
-#  new BR:
-ARMADEUS_UBOOT_IMAGE_NAME = $(BOARD_NAME)-u-boot.bin
-ifeq ($(BR2_CPU_NAME),imxl)
+ifeq ($(CPU_NAME),imxl)
 U_BOOT_BIN=u-boot.bin
-else ifeq ($(BR2_CPU_NAME),imx28)
+else ifeq ($(CPU_NAME),imx28)
 U_BOOT_BIN=u-boot.sb
 U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
-ARMADEUS_UBOOT_IMAGE_NAME = $(BOARD_NAME)-u-boot.sb
 TARGETS+=host-elftosb host-imx28-usb-downloader
 else
 U_BOOT_BIN=u-boot-nand.bin


hooks/post-receive
-- 
armadeus