[U-Boot-Users] ARM[] voiceblue update

[Ladislav Michl]

On Tue, Jan 29, 2008 at 08:22:20AM +0000, Peter Pearse wrote:
> 	I get one warning:-
> 
> cmd_jffs2.c:144:2: warning: #warning "MTDPARTS_DEFAULT not defined!"
> 
> Your patch removed
> 
> #define MTDPARTS_DEFAULT
> "mtdparts=omapflash.0:128k(uboot),64k(env),64k(r_env),16256k(data1),-(data2)
> "

Hmm, it certainly wasn't my patch which removed MTDPARTS_DEFAULT. See
this hunk:
@@ -221,19 +191,15 @@
  */
 #define CONFIG_JFFS2_CMDLINE
 #define MTDIDS_DEFAULT		"nor0=omapflash.0"
-#define MTDPARTS_DEFAULT	"mtdparts=omapflash.0:128k(uboot),64k(env),64k(r_env),16256k(data1),-(data2)"
-
-#endif	/* VOICEBLUE_SMALL_FLASH */
+#define MTDPARTS_DEFAULT	"mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)"

And diffing my vs. your version of voiceblue.h also brings interesting
result.
--- voiceblue.h	2008-01-30 22:16:10.000000000 +0100
+++ include/configs/voiceblue.h	2008-01-25 12:38:08.000000000 +0100
@@ -137,7 +137,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_RUN
 
-
 /*
  * BOOTP options
  */
@@ -162,7 +161,7 @@
 	"setpart="						\
 	"if test -n $swapos; then "				\
 		"setenv swapos; saveenv; "			\
-		"if test $ospart -eq 0; then setenv ospart 1; else setenv ospart 0; fi; "\
+		"if test $ospart -eq 0; then setenv ospart 1; else setenv ospart 0; +fi; "\
 	"fi\0"							\
 	"setup=setenv bootargs console=ttyS0,$baudrate "	\
 		"mtdparts=$mtdparts\0"				\
@@ -191,7 +190,6 @@
  */
 #define CONFIG_JFFS2_CMDLINE
 #define MTDIDS_DEFAULT		"nor0=omapflash.0"
-#define MTDPARTS_DEFAULT	"mtdparts=omapflash.0:256k(u-boot),64k(env),64k(r_env),16192k(data0),-(data1)"
 
 
 /*

 Indeed, I didn't notice, because partitioning was already saved in
 environment. Could you please revert your changes except removing that
 blank line (@@ -137,7 +137,6 @@)?

 Best regards,
 	ladis