[DNX#2006033142000267] [U-Boot-Users] [PATCH] Update VoiceBlue to use new [...]

[DENX Support System]

Hello list,

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

<snip>
> On Mon, Aug 08, 2005 at 01:08:47AM +0200, Wolfgang Denk wrote:
> > Among the modified and not tested targets there is a group of targets
> > which were implementing their custom multi-partition scheme. This was
> > mostly duplicating jffs2_part_info() routine  code.  Introducing  the
> > new  common  scheme  required removing this duplicated code, so those
> > targets should be especially carefully  tested  by  the  board  main-
> > tainers.  Target  list  that  require  special  attention:  xsengine,
> > voiceblue, ...
> 
> Hi Wolfgang,
> 
> support for VoiceBlue board is broken in 1.1.3, because it needs
> partitions (well, my fault. I shouldn't be on holidays ;-)). Patch below
> fixes that (and a bit more).
> 
> Best regards,
> 	ladis
> 
> CHANGELOG
> * VoiceBlue update: use new MTD flash partitioning methods, use more
>   reasonable TEXT_BASE, update default environment and enable keyed
>   autoboot.
> 
> Signed-off-by: Ladislav Michl <ladis at linux-mips.org>
> 
> 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/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,6 +177,7 @@
>  #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="						\
> @@ -185,15 +189,37 @@
>  	"fi\0"							\
>  	"setup=setenv bootargs console=ttyS0,$baudrate "	\
>  		"mtdparts=$mtdparts\0"				\
> -	"nfsargs=run setpart; setenv bootargs $bootargs "	\
> -		"root=/dev/nfs ip=dhcp\0"			\
> +	"nfsargs=setenv bootargs $bootargs "			\
> +		"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off " \
> +		"nfsroot=$rootpath root=/dev/nfs\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"
> +	"initrdargs=setenv bootargs $bootargs "			\
> +		"ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off\0" \
> +	"fboot=run flashargs; fsload /boot/uImage; bootm\0"	\
> +	"iboot=bootp; run initrdargs; tftp; bootm\0"		\
> +	"nboot=bootp; run nfsargs; tftp; bootm\0"
>  #endif
>  
> +#ifndef VOICEBLUE_SMALL_FLASH
> +#define CONFIG_SILENT_CONSOLE		1	/* enable silent startup */
</snip>

Your U-Boot support team