package/boot: update uboot-kirkwood to 2017.03

[oweals/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 4ff7e57bbb79458c719740459964de9a74bb4744..46b838f30b99cf7f6249661210ef20f4ecd5b170 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@ -1,23 +1,43 @@
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -83,22 +83,19 @@
+@@ -19,6 +19,7 @@
+ #define CONFIG_KW88F6281      1       /* SOC Name */
+ #define CONFIG_MACH_DOCKSTAR  /* Machine type */
+ #define CONFIG_SKIP_LOWLEVEL_INIT     /* disable board lowlevel_init */
++#define CONFIG_SYS_MVFS
+ 
+ /*
+  * Commands configuration
+@@ -45,29 +46,29 @@
+  * it has to be rounded to sector size
+  */
+ #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
+-#define CONFIG_ENV_ADDR                       0x80000
+-#define CONFIG_ENV_OFFSET             0x80000 /* env starts here */
++#define CONFIG_ENV_OFFSET             0xe0000 /* env starts here */
+ 
+ /*
   * Default environment variables
   */
  #define CONFIG_BOOTCOMMAND \
--      "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
+       "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
 -      "ubi part root; " \
--      "ubifsmount root; " \
+-      "ubifsmount ubi:root; " \
 -      "ubifsload 0x800000 ${kernel}; " \
 -      "ubifsload 0x1100000 ${initrd}; " \
 -      "bootm 0x800000 0x1100000"
-+      "${x_bootcmd_kernel}; "                                 \
-+      "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
-+      "${x_bootcmd_usb}; bootm 0x6400000;"
- 
+-
 -#define CONFIG_MTDPARTS               "mtdparts=orion_nand:1m(uboot),-(root)\0"
++      "ubi part ubi; " \
++      "ubi read 0x800000 kernel; " \
++      "bootm 0x800000"
++
 +#define CONFIG_MTDPARTS \
-+      "orion_nand:1M(u-boot),1M@1M(second_stage_u-boot),"     \
-+      "3M@2M(kernel),32M@5M(rootfs),219M@37M(data) rw\0"
++      "mtdparts=orion_nand:"                          \
++      "0xe0000@0x0(uboot),"                           \
++      "0x20000@0xe0000(uboot_env),"                   \
++      "0x100000@0x100000(second_stage_uboot),"        \
++      "-@0x200000(ubi)\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
 -      "console=console=ttyS0,115200\0" \
@@ -26,10 +46,10 @@
 -      "kernel=/boot/uImage\0" \
 -      "initrd=/boot/uInitrd\0" \
 -      "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
-+      "x_bootargs=console=ttyS0,115200 mtdparts="CONFIG_MTDPARTS      \
-+      "x_bootcmd_kernel=nand read 0x6400000 0x200000 0x300000\0"      \
-+      "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"     \
-+      "x_bootcmd_usb=usb start\0"
++      "console=console=ttyS0,115200\0"        \
++      "mtdids=nand0=orion_nand\0"             \
++      "mtdparts="CONFIG_MTDPARTS              \
++      "bootargs_root=\0"
  
  /*
   * Ethernet Driver configuration