uboot-kirkwood: update to 2019.01

[oweals/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 f2ba8137abc874b2f9d780b4aaa9a01314238bcd..2327c4a910ba46718ecfe1f557c74632207ac45c 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
+++ b/package/boot/uboot-kirkwood/patches/130-ib62x0.patch
@@ -1,6 +1,6 @@
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -62,27 +62,22 @@
+@@ -47,21 +47,15 @@
   */
  #define CONFIG_BOOTCOMMAND \
        "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
@@ -14,23 +14,27 @@
 +      "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(ubi)\0"
- 
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"                                \
        "mtdids=nand0=orion_nand\0"                                     \
-       "mtdparts="CONFIG_MTDPARTS                                      \
+-      "mtdparts="CONFIG_MTDPARTS_DEFAULT                      \
 -      "kernel=/boot/zImage\0"                                         \
 -      "fdt=/boot/ib62x0.dtb\0"                                        \
 -      "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0"                 \
 +      "bootargs_root=\0"
- 
+
  /*
   * Ethernet driver configuration
+--- a/configs/ib62x0_defconfig
++++ b/configs/ib62x0_defconfig
+@@ -21,7 +21,7 @@ CONFIG_CMD_PING=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_JFFS2=y
+ CONFIG_CMD_MTDPARTS=y
+-CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),-@0x100000(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_OF_CONTROL=y