[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-229-gccc879c

[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  ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1 (commit)
      from  993376f8aad315ae3a374e1fe6b964dbb12dc6e7 (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 ccc879c15b7aa1d81259f2f90d3cb9f8406ddbc1
Author: Eric Jarrige <eri...@ar...>
Date:   Thu Mar 29 16:28:15 2012 +0200

    [BUILDROOT] pps: fix conflict between apf27 and pps board name

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

Summary of changes:
 buildroot/configs/pps_defconfig                    |    2 +-
 ...apf27-u-boot-2011.12.h => pps-u-boot-2011.12.h} |    0
 ...madeus_specific_options_for_config_header.patch |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename buildroot/target/device/armadeus/pps/{apf27-u-boot-2011.12.h => pps-u-boot-2011.12.h} (100%)

diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 1b86023..d6fd426 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -73,7 +73,7 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
diff --git a/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
similarity index 100%
rename from buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
rename to buildroot/target/device/armadeus/pps/pps-u-boot-2011.12.h
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 01e9146..40d5c27 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
@@ -9,7 +9,7 @@ Index: buildroot/boot/uboot/uboot.mk
  	$(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 $(UBOOT_BOARD_NAME),g;"\
++	$(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;"\


hooks/post-receive
-- 
armadeus