[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-238-g4aefb2f

[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  4aefb2f3e1f6e2c99fe299d9ae52e52a8d21e908 (commit)
      from  e37170d0bfd916cee3d691b0013987d2b476375b (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 4aefb2f3e1f6e2c99fe299d9ae52e52a8d21e908
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 01:21:11 2012 +0200

    [BUILDROOT] rework u-boot binary target name and cleanup patch
    
    - use U-Boot and Buildroot naming convention prefixed with the board name
    - Use hooks instead of a buidlroot patch to customize the U-Boot target
    - create a link to the legacy file name (apfXX-u-boot.bin) to support futur board upgrade
    - remove all useless U-Boot variables

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

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |   22 ++++++++++----------
 ...ot-makes_binary_targets_name_overloadable.patch |   21 -------------------
 2 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 81a3964..3b69cfc 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,16 +9,16 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
 # for old BR:
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
-ifeq ($(CPU_NAME),imxl)
-U_BOOT_BIN=u-boot.bin
-else ifeq ($(CPU_NAME),imx28)
-U_BOOT_BIN=u-boot.sb
-UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
-U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.sb
-else
-U_BOOT_BIN=u-boot-nand.bin
-UBOOT_MAKE_TARGET:=${U_BOOT_BIN}
-endif
+define UBOOT_POST_INSTALL_IMAGES_ACTION
+	@if [ -e "$(BINARIES_DIR)/$(UBOOT_BIN)" ]; then \
+		rm -f $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ;\
+		mv $(BINARIES_DIR)/$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ; \
+	fi
+	@if [ ! -e "$(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin" ]; then \
+		ln -sf $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) $(BINARIES_DIR)/$(BOARD_NAME)-u-boot.bin ; \
+	fi
+endef
+
+UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
 
 endif
diff --git a/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
deleted file mode 100644
index afb55ca..0000000
--- a/patches/buildroot/2012.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Allow board custom Makefiles to choose the name of the U-Boot's resulting binary
-and the name it should take when copied to $(BINARIES_DIR).
-
-Specific for Armadeus.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-Signed-off-by: Eric Jarrige <eri...@ar...>
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk	2012-02-21 16:44:28.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk	2012-02-21 16:44:29.000000000 +0100
-@@ -96,7 +96,7 @@
- endef
- 
- define UBOOT_INSTALL_IMAGES_CMDS
--	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
-+	cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/$(U_BOOT_TARGET_BIN)
- endef
- 
- $(eval $(call GENTARGETS))


hooks/post-receive
-- 
armadeus