[U-Boot] [PATCH 2/2] kirkwood: ib62x0: Support flattened devicetree

[DrEagle]

Hi Simon and Luka,

Le 21/07/2012 10:03, Luka Perkov a écrit :
> On Fri, Jul 20, 2012 at 09:59:15PM +0200, Simon Baatz wrote:
>> Support for the IB-NAS62x0 was added to the Linux mainline kernel
>> as of 3.5-rc1 using flattened devicetree.  Change the config for
>> this board accordingly.
>>
>> Signed-off-by: Simon Baatz <gmbnomis at gmail.com>
>> Cc: Luka Perkov <uboot at lukaperkov.net>
>> Cc: Prafulla Wadaskar <prafulla at marvell.com>
>> ---
>>  include/configs/ib62x0.h |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
>> index 85856f2..34c83a4 100644
>> --- a/include/configs/ib62x0.h
>> +++ b/include/configs/ib62x0.h
>> @@ -37,9 +37,9 @@
>>  #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
>>  
>>  /*
>> - * Machine type
>> + * Enable device tree support
>>   */
>> -#define CONFIG_MACH_TYPE	MACH_TYPE_NAS6210
>> +#define CONFIG_OF_LIBFDT
> 
> Do we need to change environment variables too? This is how I'm booting OpenWrt
> with linux 3.3 now:

Is it not better to have the same mtdparts as in the original stock
firmware and in the next linux kernel ?

Then we will just need small specifics distribution patch to customize
the upstream uboot for the specifics boot params:
In Debian, we need the initrd for raid support system bootup.

It is better to have the same partition scheme in next linux kernel and
in uboot, whatever it will be.
And better to be more closer from the original one, to make end-user
upgrade process simpler.

An alternative will be to have parameters, if possible, to put uboot
distribution wide compatible.
May be a bootstrap call (bootscript call from uboot) or another tweak ?

> diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
> index 85856f2..b1c11fd 100644
> --- a/include/configs/ib62x0.h
> +++ b/include/configs/ib62x0.h
> @@ -87,25 +87,23 @@
>   */
>  #define CONFIG_BOOTCOMMAND \
>         "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
> -       "ubi part root; "                                               \
> -       "ubifsmount root; "                                             \
> +       "ubi part rootfs; "                                             \
> +       "ubifsmount rootfs; "                                           \
>         "ubifsload 0x800000 ${kernel}; "                                \
> -       "ubifsload 0x1100000 ${initrd}; "                               \
> -       "bootm 0x800000 0x1100000"
> +       "bootm 0x800000"
>  
>  #define CONFIG_MTDPARTS                                \
>         "mtdparts=orion_nand:"                  \
>         "0x80000 at 0x0(uboot),"                   \
>         "0x20000 at 0x80000(uboot_env),"           \
> -       "- at 0xa0000(root)\0"
> +       "- at 0xa0000(rootfs)\0"
>  
>  #define CONFIG_EXTRA_ENV_SETTINGS                                      \
>         "console=console=ttyS0,115200\0"                                \
>         "mtdids=nand0=orion_nand\0"                                     \
>         "mtdparts="CONFIG_MTDPARTS                                      \
>         "kernel=/boot/uImage\0"                                         \
> -       "initrd=/boot/uInitrd\0"                                        \
> -       "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
> +       "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
>  
>  /*
>   * Ethernet driver configuration
> 
> Regards,
> Luka

Regards,
DrEagle