uboot-kirkwood: update to 2019.01

[openwrt/staging/wigyori.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 ff2c33877b683d1ac6ba2d2b016af63984fc5ed6..f060c33c6322c7e8f7f8f474c2bdabb491a117c4 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/110-dockstar.patch
+++ b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
@@ -1,6 +1,6 @@
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -18,6 +18,7 @@
+@@ -17,6 +17,7 @@
  #define CONFIG_FEROCEON_88FR131       1       /* CPU Core subversion */
  #define CONFIG_KW88F6281      1       /* SOC Name */
  #define CONFIG_SKIP_LOWLEVEL_INIT     /* disable board lowlevel_init */
@@ -8,7 +8,7 @@
 
  /*
   * mv-common.h should be defined after CMD configs since it used them
-@@ -36,27 +37,22 @@
+@@ -35,27 +36,22 @@
   * it has to be rounded to sector size
   */
  #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
@@ -46,12 +46,12 @@
   * Ethernet Driver configuration
 --- a/configs/dockstar_defconfig
 +++ b/configs/dockstar_defconfig
-@@ -16,7 +16,7 @@ CONFIG_CMD_PING=y
- CONFIG_CMD_EXT2=y
+@@ -18,7 +18,7 @@ CONFIG_CMD_PING=y
  CONFIG_CMD_FAT=y
  CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
 -CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:1m(uboot),-(root)"
 +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(ubi)"
  CONFIG_CMD_UBI=y
  CONFIG_ISO_PARTITION=y
- CONFIG_ENV_IS_IN_NAND=y
+ CONFIG_OF_CONTROL=y