[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-248-g96c7dde

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  96c7dde3124d6c778350816b6965347c837221a4 (commit)
       via  024eb5e6b07cd91ce85701c565bb9bfda35f5153 (commit)
       via  75444ee9508569748dc8e2ed1d2caa5002710dcb (commit)
      from  7f8705fc422e80887e229bc05c3f800d8658e2e4 (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 96c7dde3124d6c778350816b6965347c837221a4
Merge: 024eb5e 7f8705f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 18:32:56 2012 +0200

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

commit 024eb5e6b07cd91ce85701c565bb9bfda35f5153
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 18:31:04 2012 +0200

    [BUILDROOT] Change BR specific patches for UBoot to be a hook command in the armadeus makefiles

commit 75444ee9508569748dc8e2ed1d2caa5002710dcb
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Apr 3 18:23:17 2012 +0200

    [BUILDROOT] Change BR specific patches for UBoor to be a hook command in the armadeus makefiles

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

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |   21 ++++++++++++++++
 ...d_possibility_to_choose_board_header_file.patch |   25 --------------------
 ...madeus_specific_options_for_config_header.patch |   24 -------------------
 3 files changed, 21 insertions(+), 49 deletions(-)
 delete mode 100644 patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 3b69cfc..6bd55ea 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -9,6 +9,27 @@ ARMADEUS_LINUX_IMAGE_NAME:=$(BOARD_NAME)-linux.bin
 # for old BR:
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
+ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
+define UBOOT_COPY_CONFIG_HEADER_FILE
+	cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+endef
+UBOOT_POST_PATCH_HOOKS += UBOOT_COPY_CONFIG_HEADER_FILE
+endif
+
+define UBOOT_UPDATE_CONFIG_HEADER
+	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
+	$(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
+$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),))
+	$(SED) "s,^#define CONFIG_NR_DRAM_POPULATED.*,#define CONFIG_NR_DRAM_POPULATED $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
+$(endif)
+endef
+UBOOT_POST_CONFIGURE_HOOKS += UBOOT_UPDATE_CONFIG_HEADER
+
 define UBOOT_POST_INSTALL_IMAGES_ACTION
 	@if [ -e "$(BINARIES_DIR)/$(UBOOT_BIN)" ]; then \
 		rm -f $(BINARIES_DIR)/$(BOARD_NAME)-$(UBOOT_BIN) ;\
diff --git a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index c81dd7b..cd8a50e 100644
--- a/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2012.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -24,28 +24,3 @@ Index: buildroot/boot/uboot/Config.in
  choice
  	prompt "U-Boot Version"
  	default BR2_TARGET_UBOOT_2011_12
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot.orig/boot/uboot/uboot.mk	2012-02-21 16:43:28.000000000 +0100
-+++ buildroot/boot/uboot/uboot.mk	2012-02-21 16:44:26.000000000 +0100
-@@ -35,6 +35,12 @@
- 
- UBOOT_ARCH=$(KERNEL_ARCH)
- 
-+ifneq ($(strip $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE)),)
-+define UBOOT_COPY_HEADER_FILE
-+	cp -pf $(BR2_TARGET_UBOOT_CONFIG_HEADER_FILE) $(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+endef
-+endif
-+
- UBOOT_CONFIGURE_OPTS += CONFIG_NOSOFTFLOAT=1
- UBOOT_MAKE_OPTS += \
- 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
-@@ -62,6 +68,7 @@
- endif
- 
- define UBOOT_CONFIGURE_CMDS
-+	$(UBOOT_COPY_HEADER_FILE)
- 	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
- 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
- 		$(UBOOT_BOARD_NAME)_config
diff --git a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
deleted file mode 100644
index 40d5c27..0000000
--- a/patches/buildroot/2012.02/175-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Armadeus APF modules require some special U-Boot config variables to be set.
-
-Index: buildroot/boot/uboot/uboot.mk
-===================================================================
---- buildroot/boot/uboot/uboot.mk	2012-03-02 17:43:02.634245000 +0100
-+++ buildroot/boot/uboot/uboot.mk	2012-03-08 17:13:34.000000000 +0100
-@@ -90,6 +90,17 @@ define UBOOT_CONFIGURE_CMDS
- 	$(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
- 	$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
- 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
-+
-+	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
-+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
-+	$(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
-+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(endif)
-+$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),))
-+	$(SED) "s,^#define CONFIG_NR_DRAM_POPULATED.*,#define CONFIG_NR_DRAM_POPULATED $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
-+$(endif)
- endef
- 
- define UBOOT_BUILD_CMDS


hooks/post-receive
-- 
armadeus


