uboot/kirkwood: correct mtdparts + cmdline for new ubifs on dockstar

[openwrt.git] / package / boot / uboot-kirkwood / patches / 110-dockstar.patch

diff --git a/package/boot/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
index b0a7f54..469dfcd 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@ -1,22 +1,20 @@
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -15,21 +15,26 @@
+@@ -17,20 +17,25 @@
  /*
   * Version number information
   */
 -#define CONFIG_IDENT_STRING   "\nSeagate FreeAgent DockStar"
-+#define CONFIG_IDENT_STRING   " Seagate FreeAgent DockStar"
++#define CONFIG_IDENT_STRING   "Seagate FreeAgent DockStar"
  
  /*
 - * High Level Configuration Options (easy to change)
-+ * High level configuration options
++ * High Level Configuration Options
   */
 -#define CONFIG_FEROCEON_88FR131       1       /* CPU Core subversion */
--#define CONFIG_KIRKWOOD               1       /* SOC Family Name */
 -#define CONFIG_KW88F6281      1       /* SOC Name */
 -#define CONFIG_MACH_DOCKSTAR  /* Machine type */
 +#define CONFIG_FEROCEON_88FR131               /* CPU Core subversion */
-+#define CONFIG_KIRKWOOD                       /* SOC Family Name */
 +#define CONFIG_KW88F6281              /* SOC Name */
  #define CONFIG_SKIP_LOWLEVEL_INIT     /* disable board lowlevel_init */
  
@@ -34,7 +32,7 @@
  #include <config_cmd_default.h>
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_ENV
-@@ -37,55 +42,58 @@
+@@ -38,55 +43,52 @@
  #define CONFIG_CMD_NAND
  #define CONFIG_CMD_PING
  #define CONFIG_CMD_USB
@@ -85,20 +83,16 @@
 -      "bootm 0x800000 0x1100000"
 -
 -#define CONFIG_MTDPARTS               "mtdparts=orion_nand:1m(uboot),-(root)\0"
-+      "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; "                            \
++      "bootz 0x800000"
 +
 +#define CONFIG_MTDPARTS \
 +      "mtdparts=orion_nand:"                          \
 +      "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" \
@@ -110,9 +104,7 @@
 +      "console=console=ttyS0,115200\0"        \
 +      "mtdids=nand0=orion_nand\0"             \
 +      "mtdparts="CONFIG_MTDPARTS              \
-+      "kernel=/boot/zImage\0"                 \
-+      "fdt=/boot/dockstar.dtb\0"              \
-+      "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
++      "bootargs_root=\0"
  
  /*
 - * Ethernet Driver configuration
@@ -120,7 +112,7 @@
   */
  #ifdef CONFIG_CMD_NET
  #define CONFIG_MVGBE_PORTS    {1, 0}  /* enable port 0 only */
-@@ -101,7 +109,7 @@
+@@ -102,7 +110,7 @@
  #define CONFIG_CMD_UBI
  #define CONFIG_CMD_UBIFS
  #define CONFIG_RBTREE
@@ -129,13 +121,3 @@
  #define CONFIG_MTD_PARTITIONS
  #define CONFIG_CMD_MTDPARTS
  #define CONFIG_LZO
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -190,6 +190,7 @@ Active  arm         arm926ejs      kirkw
- 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    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>
- Active  arm         arm926ejs      lpc32xx     timll           devkit3250          devkit3250                           -                                                                                                                                 Vladimir Zapolskiy <vz@mleia.com>
- Active  arm         arm926ejs      mb86r0x     syteco          jadecpu             jadecpu                              -                                                                                                                                 Matthias Weisser <weisserm@arcor.de>