[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-146-g5dff8e3

[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  5dff8e329624ce6bd347e005357354a1590da129 (commit)
       via  cf8abbf3815e6cc2d902e966dd2afb2094d947df (commit)
      from  8c50b3c8e6984cd967f3e6e9e959e687dbe49261 (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 5dff8e329624ce6bd347e005357354a1590da129
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Feb 19 14:45:49 2014 +0100

    [UBOOT] pps27: move to U-Boot standard SPL target name u-boot-with-spl.bin

commit cf8abbf3815e6cc2d902e966dd2afb2094d947df
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Feb 19 14:45:12 2014 +0100

    [BUILDROOT] pps27: update U-Boot target name

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

Summary of changes:
 buildroot/configs/pps_defconfig                    |    3 ++-
 .../device/armadeus/pps/pps-u-boot-2013.04.h       |    9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 8c3c367..e72a797 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -88,7 +88,8 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-20
 BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
-BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
 BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
index efae309..cbd67ba 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	10
-#define CONFIG_IDENT_STRING	" pps patch 3.10"
+#define CONFIG_ENV_VERSION 	11
+#define CONFIG_IDENT_STRING	" pps patch 3.20"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -43,12 +43,13 @@
 #define CONFIG_SYS_NAND_U_BOOT_SIZE	CONFIG_SYS_MONITOR_LEN
 /* Build image with spl and u-boot */
 #define CONFIG_NAND_U_BOOT
-#define CONFIG_SPL_PAD_TO		0xa0000800
+#define CONFIG_SPL_PAD_TO		0x00000800
 
 /*
  * SPL
  */
 #define	CONFIG_SPL
+#define CONFIG_SPL_TARGET		"u-boot-with-spl.bin"
 #define CONFIG_SPL_TEXT_BASE            0xa0000000
 #define CONFIG_SPL_STACK                0xffffff00
 #define CONFIG_SYS_NAND_U_BOOT_START    0xa0000800
@@ -221,7 +222,7 @@
 	"flash_reset_env=env default -f -a && saveenv &&"		\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
-		"-u-boot-nand.bin\0"					\
+		"-u-boot-with-spl.bin\0"					\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"				\
 		"if nand write.trimffs ${fileaddr} ${u-boot_addr} "	\


hooks/post-receive
-- 
armadeus