[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-112-gd79c9fa

[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  d79c9fa65e41b265983026dbef986aea0a860d27 (commit)
      from  cb823d7a347f5cdae8450726e5a7d8be5f5c746b (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 d79c9fa65e41b265983026dbef986aea0a860d27
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 8 17:27:07 2012 +0100

    [BUILDROOT] some macros depend on some updates - refactoring expect after the BR2012.02 migration

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

Summary of changes:
 ...madeus_specific_options_for_config_header.patch |   25 ++++++++++---------
 1 files changed, 13 insertions(+), 12 deletions(-)

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
index 5447fc4..f8f8e3d 100644
--- 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
@@ -3,27 +3,28 @@ 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-02 17:58:45.761539865 +0100
-@@ -85,6 +85,22 @@ define UBOOT_CONFIGURE_CMDS
- 	$(call insert_define,CONFIG_SERVERIP,$(BR2_TARGET_UBOOT_SERVERIP))
++++ buildroot/boot/uboot/uboot.mk	2012-03-08 17:13:34.000000000 +0100
+@@ -90,6 +90,23 @@ define UBOOT_CONFIGURE_CMDS
  	$(call insert_define,CONFIG_ETHADDR,$(BR2_TARGET_UBOOT_ETHADDR))
  	$(call insert_define,CONFIG_ETH1ADDR,$(BR2_TARGET_UBOOT_ETH1ADDR))
-+$(ifneq ($(strip $(BOARD_NAME)),""))
-+	$(call insert_define, CONFIG_BOARD_NAME, $(BOARD_NAME))
-+$(endif)
+ 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
++
++	$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(UBOOT_BOARD_NAME),g;"\
++		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
 +$(ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),))
 +	$(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
-+		$(@D)/include/config.h
++		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
 +	$(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
-+		$(@D)/include/config.h
++		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
 +$(endif)
 +$(ifneq ($(strip $(BR2_TARGET_ARMADEUS_NR_SDRAM)),"1"))
 +	$(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+		$(@D)/include/config.h
++		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
 +	$(SED) "s,^#define CONFIG_SYS_NR_DRAM_BANKS.*,#define CONFIG_SYS_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
-+		$(@D)/include/config.h
-+	$(call insert_define, CONFIG_NR_DRAM_POPULATED, $(BR2_TARGET_ARMADEUS_NR_SDRAM))
++		$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
++	$(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)
- 	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(@D)/include/config.h
  endef
  
+ define UBOOT_BUILD_CMDS


hooks/post-receive
-- 
armadeus