[U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement

[Andreas Bießmann]

Hi Jens,

On 08/19/2013 11:55 AM, Jens Scharsig (BuS Elektronik) wrote:
> From: "Jens Scharsig (BuS Elektronik)" <esw at bus-elektronik.de>
> 
> - remove jffs2 support, board doesn't use this anymore
> - add ubifs support
> - change sizes and start for partitions
> 
> Signed-off-by: Jens Scharsig (BuS Elektronik) <esw at bus-elektronik.de>
> 
> ---
> 
> sorry about this fast V2. localversion-eb_cpux9k2 are now removed from patch

no problem ;)

>  include/configs/eb_cpux9k2.h | 61 ++++++++++++++++++++++----------------------
>  localversion-eb_cpux9k2      |  2 +-
>  2 files changed, 32 insertions(+), 31 deletions(-)
> 

<snip>

> @@ -367,12 +366,14 @@
>  	"displayheight=512\0"						\
>  	"displaybsteps=1023\0"						\
>  	"ubootaddr=10000000\0"						\
> -	"splashimage=10080000\0"					\
> -	"kerneladdr=100A0000\0"						\
> +	"splashimage=100A0000\0"					\
> +	"kerneladdr=100C0000\0"						\
>  	"kernelsize=00400000\0"						\
> -	"rootfsaddr=10500000\0"						\
> +	"rootfsaddr=10520000\0"						\
>  	"copy_addr=21200000\0"						\
> -	"rootfssize=00B00000\0"						\
> +	"rootfssize=00AE0000\0"						\
> +	"mtdids=" MTDIDS_DEFAULT "\0"					\
> +	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
>  	"bootargsdefaults=set bootargs "				\
>  		"console=ttyS0,115200 "					\
>  		"video=vcxk_fb:xres:${displaywidth},"			\

sorry, but this hunk doesn't apply cleanly on top of current
u-boot-atmel/master, could you please rebase?

Best regards,

Andreas Bießmann