[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-276-g9f82a44

[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  9f82a44fded13f6391e9bbdb1cc99c7f66550488 (commit)
       via  4cb26be15d5fc17004be085812ca989d93ec1b8b (commit)
       via  49c2732d272dedfd122f32df3792347b4a0a459e (commit)
      from  6bf1b10aa3043eac861515ed39b4990e2e7e4446 (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 9f82a44fded13f6391e9bbdb1cc99c7f66550488
Author: jorasse <jo...@ar...>
Date:   Thu Apr 1 00:01:47 2010 +0200

    [UBoot] Fixed file naming convention

commit 4cb26be15d5fc17004be085812ca989d93ec1b8b
Merge: 49c2732d272dedfd122f32df3792347b4a0a459e 6bf1b10aa3043eac861515ed39b4990e2e7e4446
Author: jorasse <jo...@ar...>
Date:   Wed Mar 31 23:56:13 2010 +0200

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

commit 49c2732d272dedfd122f32df3792347b4a0a459e
Author: jorasse <jo...@ar...>
Date:   Wed Mar 31 23:55:11 2010 +0200

    [UBoot] Changed default U-Boot name of config file to support multiple U-Boot versions

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

Summary of changes:
 buildroot/configs/apf27_defconfig                  |    2 +-
 buildroot/configs/apf9328_defconfig                |    2 +-
 .../051i-u-boot-multi-version-support.patch        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 0e60d9c..791ebfc 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -790,7 +790,7 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
 BR2_TARGET_UBOOT_1_3_4=y
 # BR2_TARGET_UBOOT_2010_03 is not set
 # BR2_TARGET_UBOOT_2009_11 is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index ca65e62..ca426bd 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -786,7 +786,7 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
 BR2_TARGET_UBOOT_1_3_4=y
 # BR2_TARGET_UBOOT_2010_03 is not set
 # BR2_TARGET_UBOOT_2009_11 is not set
diff --git a/patches/buildroot/2010.02/051i-u-boot-multi-version-support.patch b/patches/buildroot/2010.02/051i-u-boot-multi-version-support.patch
index d4b3640..6973c6d 100644
--- a/patches/buildroot/2010.02/051i-u-boot-multi-version-support.patch
+++ b/patches/buildroot/2010.02/051i-u-boot-multi-version-support.patch
@@ -5,7 +5,7 @@
  config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
  	string "U-Boot header file"
 -	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-uboot-$(BR2_UBOOT_VERSION).h"
++	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
  	help
  	  U-Boot config header file to use to build U-Boot for your target.
  	  Mainly for people using boards not (yet) integrated in U-Boot's


hooks/post-receive
-- 
armadeus