[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-216-g7b9778f

[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  7b9778f1043c2f120f3bc5bcc88219bf876fbcde (commit)
       via  3d935585d7ed6453ec72eae20b1b3fb4d750dc63 (commit)
       via  2097745995e8a88c4b2d18cbea64aa581bc341bd (commit)
      from  8080081f70dce6398d02c9794e68d9f63ef35da9 (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 7b9778f1043c2f120f3bc5bcc88219bf876fbcde
Merge: 3d93558 8080081
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 28 12:04:11 2012 +0200

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

commit 3d935585d7ed6453ec72eae20b1b3fb4d750dc63
Merge: 2097745 d2c2c2d
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 28 12:03:32 2012 +0200

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

commit 2097745995e8a88c4b2d18cbea64aa581bc341bd
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Mar 28 12:02:55 2012 +0200

    [UBOOT] pps27: bump tu U-Boot 2011.12

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

Summary of changes:
 buildroot/configs/pps_defconfig                    |    8 ++++----
 .../armadeus/{apf27 => pps}/apf27-u-boot-2011.12.h |   10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
 copy buildroot/target/device/armadeus/{apf27 => pps}/apf27-u-boot-2011.12.h (99%)

diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 36ead96..cbf1e9e 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -75,11 +75,11 @@ BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
 BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="apf27"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-1.3.4.h"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-1.3.4.h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-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-1.3.4.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/1.3.4"
+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_TOOL_ENV=y
 # BR2_TARGET_UBOOT_NETWORK is not set
 BR2_LINUX_KERNEL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
copy to buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
index 73df973..4ff8279 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-2011.12.h
@@ -1,6 +1,6 @@
 /*
  *
- * Configuration settings for the Armadeus Project motherboard APF27
+ * Configuration settings for the Armadeus Project motherboard PPS27
  *
  * Copyright (C) 2008-2012 ej / Armadeus Project <eri...@ar...>
  *
@@ -25,8 +25,8 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"2.2"
-#define CONFIG_IDENT_STRING	" apf27 patch 2.9"
-#define CONFIG_BOARD_NAME	apf27
+#define CONFIG_IDENT_STRING	" pps patch 2.9"
+#define CONFIG_BOARD_NAME	pps
 
 /*
  * SoC configurations
@@ -179,13 +179,13 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_OF_LIBFDT
 */
-#define CONFIG_BOOTDELAY	5
+#define CONFIG_BOOTDELAY	1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 #define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
 #define CONFIG_BOOTARGS \
 	CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=ubifs " MTDPARTS_DEFAULT
 
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
 #define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CONFIG_SYS_AUTOLOAD	"no"
 /*


hooks/post-receive
-- 
armadeus