kirkwood: convert iconnect, ib62x0 and pogoplug_e02 to the new image build code

[openwrt/openwrt.git] / package / boot / uboot-kirkwood / patches / 130-ib62x0.patch

diff --git a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
index 9a086e08b168f2b3e6260ed695bf5f6eb57ab234..f2ba8137abc874b2f9d780b4aaa9a01314238bcd 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
+++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
@@ -1,31 +1,36 @@
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -190,6 +190,7 @@ Active  arm         arm926ejs      kirkw
- Active  arm         arm926ejs      kirkwood    Marvell         openrd              openrd_client                        openrd:BOARD_IS_OPENRD_CLIENT                                                                                                     -
- Active  arm         arm926ejs      kirkwood    Marvell         openrd              openrd_ultimate                      openrd:BOARD_IS_OPENRD_ULTIMATE                                                                                                   -
- Active  arm         arm926ejs      kirkwood    raidsonic       ib62x0              ib62x0                               -                                                                                                                                 Luka Perkov <luka@openwrt.org>
-+Active  arm         arm926ejs      kirkwood    raidsonic       ib62x0              ib62x0_second_stage                  ib62x0:SECOND_STAGE                                                                                                               Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    Seagate         -                   dockstar                             -                                                                                                                                 Eric Cooper <ecc@cmu.edu>
- Active  arm         arm926ejs      kirkwood    Seagate         dockstar            dockstar_second_stage                dockstar:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    Seagate         -                   goflexhome                           -                                                                                                                                 Suriyan Ramasami <suriyan.r@gmail.com>
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -91,7 +91,8 @@
+@@ -62,27 +62,22 @@
+  */
+ #define CONFIG_BOOTCOMMAND \
+       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
+-      "ubi part root; "                                               \
+-      "ubifsmount ubi:rootfs; "                                       \
+-      "ubifsload 0x800000 ${kernel}; "                                \
+-      "ubifsload 0x700000 ${fdt}; "                                   \
+-      "ubifsumount; "                                                 \
+-      "fdt addr 0x700000; fdt resize; fdt chosen; "                   \
+-      "bootz 0x800000 - 0x700000"
++      "ubi part ubi; " \
++      "ubi read 0x800000 kernel; " \
++      "bootm 0x800000"
+ 
+ #define CONFIG_MTDPARTS \
        "mtdparts=orion_nand:"                                          \
        "0xe0000@0x0(uboot),"                                           \
        "0x20000@0xe0000(uboot_env),"                                   \
 -      "-@0x100000(root)\0"
 +      "0x100000@0x100000(second_stage_uboot),"                        \
-+      "-@0x200000(root)\0"
++      "-@0x200000(ubi)\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
-@@ -99,7 +100,7 @@
+       "mtdids=nand0=orion_nand\0"                                     \
        "mtdparts="CONFIG_MTDPARTS                                      \
-       "kernel=/boot/zImage\0"                                         \
-       "fdt=/boot/ib62x0.dtb\0"                                        \
+-      "kernel=/boot/zImage\0"                                         \
+-      "fdt=/boot/ib62x0.dtb\0"                                        \
 -      "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
-+      "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
++      "bootargs_root=\0"
  
  /*
   * Ethernet driver configuration