uboot-kirkwood: New ubi flash format for Iconnect

[openwrt.git] / package / boot / uboot-kirkwood / patches / 120-iconnect.patch

diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index 36655a9..cfc1403 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
-@@ -65,30 +65,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,19 +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
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -164,6 +164,7 @@ Active  arm         arm926ejs      kirkw
- Active  arm         arm926ejs      kirkwood    cloudengines    -                   pogo_e02                             -                                                                                                                                 Dave Purdy <david.c.purdy@gmail.com>
- Active  arm         arm926ejs      kirkwood    d-link          -                   dns325                               -                                                                                                                                 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
- Active  arm         arm926ejs      kirkwood    iomega          -                   iconnect                             -                                                                                                                                 Luka Perkov <luka@openwrt.org>
-+Active  arm         arm926ejs      kirkwood    iomega          iconnect            iconnect_second_stage                iconnect:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    karo            tk71                tk71                                 -                                                                                                                                 -
- Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood                          km_kirkwood:KM_KIRKWOOD                                                                                                           Valentin Longchamp <valentin.longchamp@keymile.com>
- Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <valentin.longchamp@keymile.com>