[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-360-ga61e057

[Julien B a. A. <ar...@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  a61e0576150d20926fe543a0dc34a423a2d331e3 (commit)
       via  0e3825df23deaf363543e5a73f244594c2b3ded3 (commit)
      from  b51d3aeffc47949426cb0d93c336b5a8af43e5e6 (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 a61e0576150d20926fe543a0dc34a423a2d331e3
Merge: 0e3825d b51d3ae
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jun 10 22:08:18 2012 +0200

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

commit 0e3825df23deaf363543e5a73f244594c2b3ded3
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Jun 10 22:05:28 2012 +0200

    [BUILDROOT] Fixes PPS51 defconfig (U-Boot stuff)

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

Summary of changes:
 buildroot/configs/pps51_defconfig |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 18792d5..c19c4c9 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -77,11 +77,16 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=135301
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="apf51"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2010.03.h"
-BR2_TARGET_UBOOT_2010_03=y
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
-BR2_TARGET_UBOOT_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(ARMADEUS_PATH)/apf51/apf51-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"
+BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
+BR2_TARGET_UBOOT_NETWORK=y
+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_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"


hooks/post-receive
-- 
armadeus