[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-446-g3a4c2a0

[Sébastien S. <ss...@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  3a4c2a0fb920a5c61cb68214809c5c7923699cca (commit)
      from  7530217fd5bce5299217e164a09c5d89a73d9017 (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 3a4c2a0fb920a5c61cb68214809c5c7923699cca
Author: Sébastien Szymanski <ss...@us...>
Date:   Thu Oct 23 18:09:48 2014 +0200

    [UBOOT] 2014.07: apf6: fix update_uboot command and don't give ip args
    to the kernel.

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

Summary of changes:
 .../device/armadeus/apf6/apf6-u-boot-2014.07.h     |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index fb8fe58..9b4b89e 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	1
+#define CONFIG_ENV_VERSION	2
 #define CONFIG_BOARD_NAME	apf6
 
 /* SPL */
@@ -196,6 +196,7 @@
 	"flash_uboot_spl=" 									\
 		"if mmc dev ${mmcdev} 1; then "							\
 			"setexpr sz ${filesize} / 0x200; " 					\
+			"setexpr sz ${sz} + 1; " 						\
 			"if mmc write ${loadaddr} 0x2 ${sz}; then " 				\
 				"echo Flashing of U-boot SPL succeed; " 			\
 			"else echo Flashing of U-boot SPL failed; "				\
@@ -205,6 +206,7 @@
 	"flash_uboot_img=" 									\
 		"if mmc dev ${mmcdev} 1; then "							\
 			"setexpr sz ${filesize} / 0x200; " 					\
+			"setexpr sz ${sz} + 1; " 						\
 			"if mmc write ${loadaddr} 0x8a ${sz}; then " 				\
 				"echo Flashing of U-boot image succeed; " 			\
 			"else echo Flashing of U-boot image failed; " 				\
@@ -234,7 +236,7 @@
 	"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " 				\
 		"rootfstype=${mmcrootfstype}\0" 						\
 	"emmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; "		\
-		"run addmmcargs addipargs; "							\
+		"run addmmcargs; "								\
 		"run loadzimage && run loadfdt && bootz ${loadaddr} - ${fdt_addr};\0"		\
 	"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw "				\
 		"nfsroot=${serverip}:${rootpath}\0"						\


hooks/post-receive
-- 
armadeus