[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-17-gc3d0300

[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  c3d0300cfdfabcc5a6fc5506a82a3f0a8ab7dc19 (commit)
      from  c5c5552e2dd26324a89310f3641115814e04b57e (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 c3d0300cfdfabcc5a6fc5506a82a3f0a8ab7dc19
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Oct 24 10:13:10 2012 +0200

    [UBOOT] 2012.10/apf28: update configuration - fix script flash_reset_env - fix SD pin drive strength

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

Summary of changes:
 .../device/armadeus/apf28/apf28-u-boot-2012.10.h   |    8 +++-----
 patches/u-boot/2012.10/502-add-apf28.patch         |    8 +++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
index 28f840c..4b7db71 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.10.h
@@ -25,8 +25,8 @@
 #include <asm/arch/regs-base.h>
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"1.2"
-#define CONFIG_IDENT_STRING	" apf28 patch 1.7"
+#define CONFIG_ENV_VERSION	"1.3"
+#define CONFIG_IDENT_STRING	" apf28 patch 1.3"
 #define CONFIG_BOARD_NAME	apf28
 
 /*
@@ -135,7 +135,6 @@
 #define	PHYS_SDRAM_1_SIZE		0x20000000	/* Max 512 MiB RAM */
 #define	CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define	CONFIG_SYS_MALLOC_LEN		0x00400000	/* 4 MB for malloc */
-#define	CONFIG_SYS_GBL_DATA_SIZE	128		/* Initial data */
 #define	CONFIG_SYS_MEMTEST_START	0x40000000	/* Memtest start adr */
 #define	CONFIG_SYS_MEMTEST_END		0x40400000	/* 4 MB RAM test */
 /* Point initial SP in SRAM so SPL can use it too. */
@@ -219,7 +218,6 @@
  */
 #define	CONFIG_LOADADDR			0x40000000
 #define	CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
 /*
  * Extra Environments
@@ -289,7 +287,7 @@
 			"then echo Flashing of rootfs succeed;"		\
 			"else echo Flashing of rootfs failed;"		\
 		"fi\0"							\
-	"flash_reset_env=env default -f; saveenv;"			\
+	"flash_reset_env=env default -f -a; saveenv;"			\
 		"echo Flash environment variables erased!\0"		\
 	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0"	\
 	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
diff --git a/patches/u-boot/2012.10/502-add-apf28.patch b/patches/u-boot/2012.10/502-add-apf28.patch
index 39e1657..ca83365 100644
--- a/patches/u-boot/2012.10/502-add-apf28.patch
+++ b/patches/u-boot/2012.10/502-add-apf28.patch
@@ -75,7 +75,7 @@ new file mode 100644
 index 0000000..7f75494
 --- /dev/null
 +++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,193 @@
 +/*
 + * APF28 motherboard based on DENX M28 module
 + *
@@ -242,8 +242,10 @@ index 0000000..7f75494
 +	/* detect compatibility issue of environment version */
 +	s = getenv("env_version");
 +	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++		char * const vars[] = {"flash_reset_env"};
 +		printf("*** Warning - Environment version change suggests: "
 +		       "run flash_reset_env; reset\n");
++		set_default_vars(1, vars);
 +	}
 +
 +	return 0;
@@ -1167,9 +1169,9 @@ index 0000000..9854cda
 +	MX28_PAD_SSP0_DATA3__SSP0_D3 | MUX_CONFIG_SSP0,
 +	MX28_PAD_SSP0_CMD__SSP0_CMD | MUX_CONFIG_SSP0,
 +	MX28_PAD_SSP0_DETECT__SSP0_CARD_DETECT |
-+		(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL),
++		(MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_NOPULL),
 +	MX28_PAD_SSP0_SCK__SSP0_SCK |
-+		(MXS_PAD_3V3 | MXS_PAD_4MA | MXS_PAD_NOPULL),
++		(MXS_PAD_3V3 | MXS_PAD_12MA | MXS_PAD_NOPULL),
 +
 +	/* GPMI NAND */
 +	MX28_PAD_GPMI_D00__GPMI_D0 | MUX_CONFIG_GPMI,


hooks/post-receive
-- 
armadeus