[U-Boot-Users] Re: [PATCH] Add board voiceblue

[Ladislav Michl <ladis@linux-mips.org>]

Dear Wolfgang,

On Wed, Apr 06, 2005 at 03:37:37PM +0200, Wolfgang Denk wrote:
> Dear Ladislav,
> 
> in message <20050405175018.GA16363@orphique> you wrote:
> > 
> > this patch adds support for OMAP5910 based board Voiceblue. Small flash
> > configuration will not work in tree because it needs small patch to
					  [1] - ^^^^^^^^^^^^^^^^^^^^
> > cpu/arm925t/start.S which I sent on 12 Jan 2005 under subject "Lowering
>
> The code does not compile at all:
[snip]
> Please fix.

I'm sorry about that. I forgot to test patch without my change to
start.S. Perhaps it's time to discuss it again (well, in fact there was
no discussion so far), so I'll send it in separate mail. Here is a fix.
Please note that "smallflash" configuration will be still broken.

Best regards,
	ladis

Index: include/configs/voiceblue.h
===================================================================
RCS file: /cvsroot/u-boot/u-boot/include/configs/voiceblue.h,v
retrieving revision 1.1
diff -u -r1.1 voiceblue.h
--- include/configs/voiceblue.h	5 Apr 2005 23:32:26 -0000	1.1
+++ include/configs/voiceblue.h	6 Apr 2005 16:54:42 -0000
@@ -98,21 +98,18 @@
 #endif
 
 /*
- * Size of malloc() pool
+ * Size of malloc() pool and stack
  */
 #define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
 #ifdef VOICEBLUE_SMALL_FLASH
 #define CFG_MALLOC_LEN		(SZ_64K - CFG_GBL_DATA_SIZE)
+#define CONFIG_STACKSIZE	SZ_8K
 #else
-#define CFG_MALLOC_LEN		(SZ_4M - CFG_GBL_DATA_SIZE)
+#define CFG_MALLOC_LEN		SZ_4M
+#define CONFIG_STACKSIZE	SZ_1M
 #endif
 
 /*
- * The stack size is set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE	SZ_8K	/* regular stack */
-
-/*
  * Hardware drivers
  */
 #define CONFIG_DRIVER_SMC91111
@@ -163,7 +160,7 @@
 #ifdef VOICEBLUE_SMALL_FLASH
 #define CONFIG_BOOTDELAY	0
 #undef  CONFIG_BOOTARGS		/* the preboot command will set bootargs*/
-#define CFG_AUTOLOAD		"n"	/* No autoload */
+#define CFG_AUTOLOAD		"n"	/* no autoload */
 #define CONFIG_PREBOOT		"run setup"
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
 	"setup=setenv bootargs console=ttyS0,$(baudrate) "	\
@@ -172,8 +169,8 @@
 		"cp.b 10400000 c000000 $(filesize)\0"
 #else
 #define CONFIG_BOOTDELAY	3
-#undef  CONFIG_BOOTARGS		/* the boot command will set bootargs*/
-#define CFG_AUTOLOAD		"n"	/* No autoload */
+#undef  CONFIG_BOOTARGS		/* boot command will set bootargs */
+#define CFG_AUTOLOAD		"n"	/* no autoload */
 #define CONFIG_BOOTCOMMAND	"run nboot"
 #define CONFIG_PREBOOT		"run setup"
 #define	CONFIG_EXTRA_ENV_SETTINGS				\
@@ -188,11 +185,11 @@
 	"fi\0"							\
 	"setup=setenv bootargs console=ttyS0,$baudrate "	\
 		"mtdparts=$mtdparts\0"				\
-	"nfsargs=setenv bootargs $bootargs "			\
-		"root=/dev/nfs ip=dhcp; run setpart\0"			\
-	"flashargs=setenv bootargs $bootargs "			\
-		"root=/dev/mtdblock$partition "			\
-		"rootfstype=jffs2; run setpart\0"				\
+	"nfsargs=run setpart; setenv bootargs $bootargs "	\
+		"root=/dev/nfs ip=dhcp\0"			\
+	"flashargs=run setpart; setenv bootargs $bootargs "	\
+		"root=/dev/mtdblock$partition ro "		\
+		"rootfstype=jffs2\0"				\
 	"nboot=run nfsargs; bootp; tftp; bootm\0"		\
 	"fboot=run flashargs; fsload /boot/uImage; bootm\0"
 #endif