[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-57-gefd5135

[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  efd51354fe80fd9c959be7f5a4041056bfd2103f (commit)
       via  1fe11f74ee3c723c22593676a375fc9ee85d0528 (commit)
       via  1f90a94f2db37a353dc24ee6b8e384a71040dc8f (commit)
      from  0a672e05b0f816e724f681e32a1869a9d2b442f9 (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 efd51354fe80fd9c959be7f5a4041056bfd2103f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Feb 14 02:31:31 2012 +0100

    [UBOOT] apf27: use U-Boot 1.3.4 patched 2.3 as U-Boot recover

commit 1fe11f74ee3c723c22593676a375fc9ee85d0528
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Feb 14 02:28:44 2012 +0100

    [UBOOT] apf27: init clock at startup in any cases

commit 1f90a94f2db37a353dc24ee6b8e384a71040dc8f
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Feb 14 02:27:33 2012 +0100

    [UBOOT] apf27: keep one spare block for bad block while recovering UBoot

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-1.3.4.h     |    4 ++--
 patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch  |    6 ++----
 software/uboot_recover/apf27-u-boot.bin            |  Bin 220212 -> 226016 bytes
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
index e684a95..bfe6115 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
@@ -33,7 +33,7 @@
 #define __CONFIG_H
 
 #define CONFIG_ENV_VERSION 	"2.0"
-#define CONFIG_IDENT_STRING	" apf27 patch 2.2"
+#define CONFIG_IDENT_STRING	" apf27 patch 2.3"
 
 #define CONFIG_ARM926EJS	1	/* this is an ARM926EJS CPU */
 #define CONFIG_IMX27		1	/* in a Freescale i.MX27 Chip */
@@ -127,7 +127,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"env_version="		CONFIG_ENV_VERSION		"\0"	\
 	"fileaddr="		MK_STR(CFG_LOAD_ADDR)		"\0"	\
-	"filesize="		MK_STR(CFG_MONITOR_LEN)		"\0"	\
+	"filesize="		MK_STR(0x00080000)		"\0"	\
 	"console="		CONFIG_CONSOLE			"\0"	\
 	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
 	"partition=nand0,4\0"						\
diff --git a/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
index 61bedd3..e310176 100644
--- a/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
+++ b/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
@@ -513,7 +513,7 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S	2011-01-05 14:50:39.000000000 +0100
-@@ -0,0 +1,343 @@
+@@ -0,0 +1,341 @@
 +/*
 + * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
 + * Applications Processor Reference Manual, Rev. 0.2".
@@ -841,7 +841,7 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
 +	writel(DSCR7, CFG_DSCR7_VAL)
 +	writel(DSCR2, CFG_DSCR2_VAL)
 +
-+
++	init_clock
 +
 +	/* skip clock and sdram initialization if we run from ram */
 +	cmp	pc, #0xa0000000
@@ -851,8 +851,6 @@ Index: u-boot-1.3.4/board/armadeus/apf27/lowlevel_init.S
 +
 +	mov	pc,r10
 +1:
-+	init_clock
-+
 +	sdram_init
 +
 +	mov	pc,r10
diff --git a/software/uboot_recover/apf27-u-boot.bin b/software/uboot_recover/apf27-u-boot.bin
index 50c9b1c..74d6891 100644
Binary files a/software/uboot_recover/apf27-u-boot.bin and b/software/uboot_recover/apf27-u-boot.bin differ


hooks/post-receive
-- 
armadeus