From patchwork Sat Jul 21 08:03:44 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot,2/2] kirkwood: ib62x0: Support flattened devicetree
From: Luka Perkov <uboot@lukaperkov.net>
X-Patchwork-Id: 172409
Message-Id: <20120721080344.GB22944@w500.iskon.local>
To: Simon Baatz <gmbnomis@gmail.com>
Cc: dreagle@doukki.net, u-boot@lists.denx.de
Date: Sat, 21 Jul 2012 10:03:44 +0200

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@gmail.com>
> Cc: Luka Perkov <uboot@lukaperkov.net>
> Cc: Prafulla Wadaskar <prafulla@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:


Regards,
Luka


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@0x0(uboot),"                   \
        "0x20000@0x80000(uboot_env),"           \
-       "-@0xa0000(root)\0"
+       "-@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