[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2632-ge9f6b79

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  e9f6b79bf8f69fbf9ee4668c944d5448982195d1 (commit)
       via  2a47739de80904a6a9bb2ada386afd2b6d930628 (commit)
       via  9069bc362db79cebe186c5350c6d766628ec306d (commit)
      from  139ce8b19d000d13748505bdf55e370bedb9058f (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 e9f6b79bf8f69fbf9ee4668c944d5448982195d1
Merge: 2a47739 139ce8b
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Dec 9 19:44:39 2011 +0100

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

commit 2a47739de80904a6a9bb2ada386afd2b6d930628
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Dec 9 19:41:49 2011 +0100

    [UBOOT][APF28] Allocate 3 MiB for bootloader - No reason to restrict this size

commit 9069bc362db79cebe186c5350c6d766628ec306d
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Dec 9 19:22:03 2011 +0100

    [UBOOT][APF28] clean-up

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

Summary of changes:
 .../target/device/armadeus/apf28/apf28-u-boot-.h   |    6 +-
 patches/u-boot/2011.11/01-uboot-apf28.patch        |  113 --------------------
 2 files changed, 3 insertions(+), 116 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
index d11554c..3482f05 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-.h
@@ -156,7 +156,7 @@
 #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define	CONFIG_ENV_SECT_SIZE		(128 * 1024)
 #define	CONFIG_ENV_RANGE		(512 * 1024)
-#define	CONFIG_ENV_OFFSET		0x200000
+#define	CONFIG_ENV_OFFSET		0x300000
 #define	CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
@@ -170,7 +170,7 @@
 #define	MTDIDS_DEFAULT			"nand0=gpmi-nand.0"
 #define	MTDPARTS_DEFAULT			\
 	"mtdparts=gpmi-nand.0:"			\
-		"2M(bootloader)ro,"		\
+		"3m(bootloader)ro,"		\
 		"512k(environment),"		\
 		"512k(redundant-environment),"	\
 		"8M(kernel),"			\
@@ -249,7 +249,7 @@
 	"env_version=" CONFIG_ENV_VERSION "\0"				\
 	"update_nand_full_filename=u-boot.nand\0"			\
 	"update_nand_firmware_filename=u-boot.sb\0"			\
-	"update_nand_firmware_maxsz=0x80000\0"				\
+	"update_nand_firmware_maxsz=0x100000\0"				\
 	"update_nand_stride=0x40\0"	/* MX28 datasheet ch. 12.12 */	\
 	"update_nand_count=0x4\0"	/* MX28 datasheet ch. 12.12 */	\
 	"update_nand_get_fcb_size="	/* Get size of FCB blocks */	\
diff --git a/patches/u-boot/2011.11/01-uboot-apf28.patch b/patches/u-boot/2011.11/01-uboot-apf28.patch
index eb30c8d..6118f1a 100644
--- a/patches/u-boot/2011.11/01-uboot-apf28.patch
+++ b/patches/u-boot/2011.11/01-uboot-apf28.patch
@@ -559,103 +559,6 @@
 +
 +	mx28_mem_get_size();
 +}
---- u-boot-orig/board/armadeus/apf28/memsize.c	1970-01-01 01:00:00.000000000 +0100
-+++ u-boot-custom/board/armadeus/apf28/memsize.c	2011-11-23 21:23:45.000000000 +0100
-@@ -0,0 +1,94 @@
-+/*
-+ * (C) Copyright 2004
-+ * Wolfgang Denk, DENX Software Engineering, wd...@de....
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+#include <config.h>
-+#ifdef __PPC__
-+/*
-+ * At least on G2 PowerPC cores, sequential accesses to non-existent
-+ * memory must be synchronized.
-+ */
-+# include <asm/io.h>	/* for sync() */
-+#else
-+# define sync()		/* nothing */
-+#endif
-+
-+/*
-+ * Check memory range for valid RAM. A simple memory test determines
-+ * the actually available RAM size between addresses `base' and
-+ * `base + maxsize'.
-+ */
-+long get_ram_size(long *base, long maxsize)
-+{
-+	volatile long *addr;
-+	long           save[32];
-+	long           cnt;
-+	long           val;
-+	long           size;
-+	int            i = 0;
-+
-+	for (cnt = (maxsize / sizeof (long)) >> 1; cnt > 0; cnt >>= 1) {
-+		addr = base + cnt;	/* pointer arith! */
-+		sync ();
-+		save[i++] = *addr;
-+		sync ();
-+		*addr = ~cnt;
-+	}
-+
-+	addr = base;
-+	sync ();
-+	save[i] = *addr;
-+	sync ();
-+	*addr = 0;
-+
-+	sync ();
-+	if ((val = *addr) != 0) {
-+		/* Restore the original data before leaving the function.
-+		 */
-+		sync ();
-+		*addr = save[i];
-+		for (cnt = 1; cnt < maxsize / sizeof(long); cnt <<= 1) {
-+			addr  = base + cnt;
-+			sync ();
-+			*addr = save[--i];
-+		}
-+		return (0);
-+	}
-+
-+	for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
-+		addr = base + cnt;	/* pointer arith! */
-+		val = *addr;
-+		*addr = save[--i];
-+		if (val != ~cnt) {
-+			size = cnt * sizeof (long);
-+			/* Restore the original data before leaving the function.
-+			 */
-+			for (cnt <<= 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
-+				addr  = base + cnt;
-+				*addr = save[--i];
-+			}
-+			return (size);
-+		}
-+	}
-+
-+	return (maxsize);
-+}
 --- u-boot-orig/board/armadeus/apf28/mmc_boot.c	1970-01-01 01:00:00.000000000 +0100
 +++ u-boot-custom/board/armadeus/apf28/mmc_boot.c	2011-12-01 19:32:00.022103665 +0100
 @@ -0,0 +1,273 @@
@@ -2202,19 +2105,3 @@
  m28evk                       arm         arm926ejs   -                   denx           mx28
  nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
  nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
---- u-boot-orig/tools/mxsboot.c	2011-11-23 21:23:45.000000000 +0100
-+++ u-boot-custom/tools/mxsboot.c	2011-12-02 00:55:59.549090697 +0100
-@@ -54,11 +54,11 @@ uint32_t nand_erasesize = 128 * 1024;
- uint32_t sd_sector = 2048;
- 
- /*
-- * Each of the U-Boot bootstreams is at maximum 1MB big.
-+ * Each of the U-Boot bootstreams is at maximum 512kB big.
-  *
-  * TWEAK this if, for some wild reason, you need to boot bigger image.
-  */
--#define	MAX_BOOTSTREAM_SIZE	(1 * 1024 * 1024)
-+#define	MAX_BOOTSTREAM_SIZE	(512 * 1024)
- 
- /* i.MX28 NAND controller-specific constants. DO NOT TWEAK! */
- #define	MXS_NAND_DMA_DESCRIPTOR_COUNT		4


hooks/post-receive
-- 
armadeus


