uboot-kirkwood: New ubi flash format for Iconnect

Migrate Iconnect to new ubi image style like for dockstar.

Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
SVN-Revision: 49368

diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index e525ca00af3838ea94e12371f09c5e4b857ce37d..cfc140329983433996236ff0b3ae27a6e6e9d8e8 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -1,6 +1,6 @@
 --- a/include/configs/iconnect.h
 +++ b/include/configs/iconnect.h
-@@ -66,30 +66,35 @@
+@@ -66,30 +66,29 @@
  #define CONFIG_ENV_IS_NOWHERE
  #endif
  #define CONFIG_ENV_SIZE               0x20000
@@ -13,14 +13,12 @@
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
 -      "ubi part rootfs; "                                             \
-+      "ubi part root; "                                               \
-       "ubifsmount ubi:rootfs; "                                       \
-       "ubifsload 0x800000 ${kernel}; "                                \
+-      "ubifsmount ubi:rootfs; "                                       \
+-      "ubifsload 0x800000 ${kernel}; "                                \
 -      "bootm 0x800000"
-+      "ubifsload 0x700000 ${fdt}; "                                   \
-+      "ubifsumount; "                                                 \
-+      "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
-+      "bootz 0x800000 - 0x700000"
++      "ubi part ubi; "                                                \
++      "ubi read 0x800000 kernel; "                    \
++      "bootz 0x800000"
  
  #define CONFIG_MTDPARTS \
 -      "mtdparts=orion_nand:"          \
@@ -31,7 +29,7 @@
 +      "0xe0000@0x0(uboot),"                           \
 +      "0x20000@0xe0000(uboot_env),"                   \
 +      "0x100000@0x100000(second_stage_uboot),"        \
-+      "-@0x200000(root)\0"
++      "-@0x200000(ubi)\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
@@ -39,9 +37,7 @@
        "mtdparts="CONFIG_MTDPARTS              \
 -      "kernel=/boot/uImage\0"                 \
 -      "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
-+      "kernel=/boot/zImage\0"                 \
-+      "fdt=/boot/iconnect.dtb\0"              \
-+      "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
++      "bootargs_root=\0"
  
  /*
   * Ethernet driver configuration