[DNX#2006033142000329] [PATCH] voiceblue update (Re: [U-Boot-Users] mtdpa [...]

[DENX Support System]

Hello list,

inside the automatic U-Boot patch tracking system a new ticket
[DNX#2006033142000329] was created:

<snip>
> On Tue, Sep 13, 2005 at 05:00:17PM +0200, Ladislav Michl wrote:
> > Wolfgang,
> > 
> > On Tue, Sep 13, 2005 at 12:25:51AM +0200, Wolfgang Denk wrote:
> > > > > We willprovide an extension soon; we're going to create an additional
> > > > > variable 'mtddevnum'.
> > [snip]
> > > Just checked in. Please let me know if this works for you.
> > 
> > Works nicely, thanks a lot! Tested on board VoiceBlue and NetStar. Btw,
> > last commit to U-Boot's git repository is 10 days old. Am I supposed to
> > generate patch against CVS?
> 
> Git repository seems to be updated, thanks :-)
> 
> Signed-off-by: Ladislav Michl <ladis at linux-mips.org>
> 
> CHANGELOG
> * VoiceBlue update: use new MTD flash partitioning methods, use more
>   reasonable TEXT_BASE, update default environment and enable keyed
>   autoboot.
>     
> diff --git a/board/voiceblue/config.mk b/board/voiceblue/config.mk
> --- a/board/voiceblue/config.mk
> +++ b/board/voiceblue/config.mk
> @@ -12,5 +12,5 @@ ifeq ($(VOICEBLUE_SMALL_FLASH),y)
>  TEXT_BASE = 0x20012000
>  else
>  # Running in SDRAM...
> -TEXT_BASE = 0x13000000
> +TEXT_BASE = 0x13FD0000
>  endif
> diff --git a/board/voiceblue/voiceblue.c b/board/voiceblue/voiceblue.c
> --- a/board/voiceblue/voiceblue.c
> +++ b/board/voiceblue/voiceblue.c
> @@ -43,8 +43,8 @@ int dram_init(void)
>  
>  	*((volatile unsigned short *) VOICEBLUE_LED_REG) = 0xff;
>  
> - 	/* Take the Ethernet controller out of reset and wait
> - 	 * for the EEPROM load to complete. */
> +	/* Take the Ethernet controller out of reset and wait
> +	 * for the EEPROM load to complete. */
>  	*((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) |= 0x80;
>  	udelay(10);	/* doesn't work before interrupt_init call */
>  	*((volatile unsigned short *) GPIO_DATA_OUTPUT_REG) &= ~0x80;
> diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
> --- a/include/configs/voiceblue.h
> +++ b/include/configs/voiceblue.h
> @@ -47,6 +47,8 @@
>  #define CONFIG_SETUP_MEMORY_TAGS	1
>  #define CONFIG_INITRD_TAG		1
>  
> +#define CONFIG_VERSION_VARIABLE	1       /* include version env variable
> */
> +
>  /*
>   * Physical Memory Map
>   */
> @@ -94,7 +96,6 @@
>  
>  #define CONFIG_ENV_OVERWRITE
>  
> -#define CFG_JFFS_CUSTOM_PART	/* see board/voiceblue/jffs2parts.c */
>  #endif
>  
>  /*
> @@ -104,9 +105,11 @@
>  #ifdef VOICEBLUE_SMALL_FLASH
>  #define CFG_MALLOC_LEN		(SZ_64K - CFG_GBL_DATA_SIZE)
>  #define CONFIG_STACKSIZE	SZ_8K
> +#define PHYS_SDRAM_1_RESERVED	0
>  #else
>  #define CFG_MALLOC_LEN		SZ_4M
>  #define CONFIG_STACKSIZE	SZ_1M
> +#define PHYS_SDRAM_1_RESERVED	(CFG_MONITOR_LEN + CFG_MALLOC_LEN +
> CONFIG_STACKSIZE)
>  #endif
>  
>  /*
> @@ -174,26 +177,49 @@
>  #define CONFIG_BOOTCOMMAND	"run nboot"
>  #define CONFIG_PREBOOT		"run setup"
>  #define	CONFIG_EXTRA_ENV_SETTINGS				\
> +	"silent=1\0"						\
>  	"ospart=0\0"						\
>  	"swapos=no\0"						\
>  	"setpart="						\
>  	"if test $swapos = yes; then "				\
> -		"if test $ospart -eq 0; then chpart 4; else chpart 3; fi; "\
> +		"if test $ospart -eq 0; then chpart nor0,4; else chpart nor0,3; fi;
> "\
>  		"setenv swapos no; saveenv; "			\
>  	"else "							\
> -		"if test $ospart -eq 0; then chpart 3; else chpart 4; fi; "\
> +		"if test $ospart -eq 0; then chpart nor0,3; else chpart nor0,4; fi;
> "\
>  	"fi\0"							\
>  	"setup=setenv bootargs console=ttyS0,$baudrate "	\
> -		"mtdparts=$mtdparts\0"				\
</snip>

Your U-Boot support team