[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-351-gfc9fac0

[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  fc9fac096ce6b7459938d7d4d76476f7a6df1561 (commit)
       via  b704ce98fea5d9596fd4570a76f2c11db5bc9de6 (commit)
      from  0aab9be94e30662456eb43125f355d4d5e42025a (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 fc9fac096ce6b7459938d7d4d76476f7a6df1561
Merge: b704ce9 0aab9be
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 2 15:20:15 2013 +0200

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit b704ce98fea5d9596fd4570a76f2c11db5bc9de6
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 2 15:20:02 2013 +0200

    [BUILDROOT] apf27: update config to build apf27-u-boot-env.bin

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

Summary of changes:
 buildroot/configs/apf27_defconfig     |    3 +++
 buildroot/configs/apf27test_defconfig |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 22ffd44..7229bc2 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -82,6 +82,9 @@ BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
 BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
 BR2_TARGET_UBOOT_ETHADDR=""
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 5fe8b28..c9e1bb7 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -141,6 +141,9 @@ BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
 BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
 BR2_TARGET_UBOOT_ETHADDR=""
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"


hooks/post-receive
-- 
armadeus