[U-Boot] [PATCH] [ARM] Apollon UBI support

[Wolfgang Denk]

Dear Kyungmin Park,

In message <20081021091908.GA29310 at july> you wrote:
> If you want to UBI on Apollon, uncomment the CONFIG_SYS_USE_UBI macro
> 
> Signed-off-by: Kyungmin Park <kyungmin.park at samsung.com>
> ---
>  board/apollon/Makefile    |    4 ++-
>  board/apollon/ubi.c       |   55 +++++++++++++++++++++++++++++++++++++++++++++
>  include/configs/apollon.h |   27 +++++++++++++++++++--
>  3 files changed, 82 insertions(+), 4 deletions(-)
>  create mode 100644 board/apollon/ubi.c
...
> diff --git a/include/configs/apollon.h b/include/configs/apollon.h
> index d71ed44..3377f60 100644
> --- a/include/configs/apollon.h
> +++ b/include/configs/apollon.h
> @@ -53,6 +53,9 @@
>  #define CONFIG_SYS_USE_NOR		1
>  #endif
>  
> +/* uncommnet if you want to use UBI */
> +#define CONFIG_SYS_USE_UBI
> +
>  #include <asm/arch/omap2420.h>	/* get chip and board defs */
>  
>  #define	V_SCLK	12000000
> @@ -73,7 +76,7 @@
>   * Size of malloc() pool
>   */
>  #define	CONFIG_ENV_SIZE SZ_128K	/* Total Size of Environment Sector */
> -#define	CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + SZ_128K)
> +#define	CONFIG_SYS_MALLOC_LEN	(CONFIG_ENV_SIZE + SZ_1M)
>  #define	CONFIG_SYS_GBL_DATA_SIZE	128	/* bytes reserved for initial data */

Maximum line length exceeded.

>  /*
> @@ -116,6 +119,12 @@
>  #define	CONFIG_CMD_DIAG
>  #define	CONFIG_CMD_ONENAND
>  
> +#ifdef CONFIG_SYS_USE_UBI
> +#define	CONFIG_CMD_JFFS2
> +#define	CONFIG_CMD_UBI
> +#define	CONFIG_RBTREE
> +#endif
> +
>  #undef	CONFIG_CMD_AUTOSCRIPT
>  
>  #ifndef	CONFIG_SYS_USE_NOR
> @@ -134,9 +143,9 @@
>  #define	CONFIG_ETHADDR	00:0E:99:00:24:20
>  
>  #ifdef	CONFIG_APOLLON_PLUS
> -# define	CONFIG_BOOTARGS "root=/dev/nfs rw mem=64M console=ttyS0,115200n8 ip=192.168.116.25:192.168.116.1:192.168.116.1:255.255.255.0:apollon:eth0:off nfsroot=/tftpboot/nfsroot profile=2"
> +# define	CONFIG_BOOTARGS "root=/dev/nfs rw mem=64M console=ttyS0,115200n8 ip=192.168.116.25:192.168.116.1:192.168.116.1:255.255.255.0:apollon:eth0:off nfsroot=/tftpboot/nfsroot profile=2 lpj=1646592 ubi.mtd=4"
>  #else
> -# define	CONFIG_BOOTARGS "root=/dev/nfs rw mem=128M console=ttyS0,115200n8 ip=192.168.116.25:192.168.116.1:192.168.116.1:255.255.255.0:apollon:eth0:off nfsroot=/tftpboot/nfsroot profile=2"
> +# define	CONFIG_BOOTARGS "root=/dev/nfs rw mem=128M console=ttyS0,115200n8 ip=192.168.116.25:192.168.116.1:192.168.116.1:255.255.255.0:apollon:eth0:off nfsroot=/tftpboot/nfsroot profile=2 lpj=1646592 ubi.mtd=4"

Maximum line length exceeded.

And please do not hard-code network parameters into U-Boot.

>  #endif
>  
>  #define	CONFIG_EXTRA_ENV_SETTINGS					\
> @@ -151,6 +160,7 @@
>  	"oneboot=onenand read 0x80008000 0x40000 0x200000; go 0x80008000\0"\
>  	"onesyncboot=run syncmode oneboot\0"				\
>  	"updateb=tftp 0x80180000 u-boot-onenand.bin; onenand erase 0x0 0x20000; onenand write 0x80180000 0x0 0x20000\0"					\
> +	"ubi=setenv bootargs ${bootargs} ubi.mtd=4 ${mtdparts}; run uImage\0" \

Please also fix too long line above.


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"One day," said a dull voice from down below, "I'm going to  be  back
in  form again and you're going to be very sorry you said that. For a
very long time. I might even go so far as to make even more Time just
for you to be sorry in."              - Terry Pratchett, _Small Gods_