uboot-kirkwood: update to 2018.03

[openwrt/staging/blogic.git] / package / boot / uboot-kirkwood / patches / 140-pogoplug_e02.patch

diff --git a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
index 5c8ff35bee239bcdab1ce9642e9bf7d7a3cd1aad..34379f261755f48df1c61e0003d59ad281abf790 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
+++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@ -1,6 +1,6 @@
 --- a/include/configs/pogo_e02.h
 +++ b/include/configs/pogo_e02.h
-@@ -44,23 +44,30 @@
+@@ -44,23 +44,23 @@
  #endif
  
  #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
@@ -14,18 +14,11 @@
 -      "setenv bootargs $(bootargs_console); " \
 -      "run bootcmd_usb; " \
 -      "bootm 0x00800000 0x01100000"
-+      "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
++      "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
 +      "ubi part ubi; "                                                \
 +      "ubifsmount ubi:rootfs; "                                       \
 +      "ubi read 0x800000 kernel; "                                    \
 +      "bootm 0x800000"
-+
-+#define CONFIG_MTDPARTS \
-+      "mtdparts=orion_nand:" \
-+      "0xe0000@0x0(uboot)," \
-+      "0x20000@0xe0000(uboot_env)," \
-+      "0x100000@0x100000(second_stage_uboot)," \
-+      "-@0x200000(ubi)\0"
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
 -      "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
@@ -36,8 +29,18 @@
 -      "ext2load usb 0:1 0x01100000 /uInitrd\0"
 +      "console=console=ttyS0,115200\0"        \
 +      "mtdids=nand0=orion_nand\0"             \
-+      "mtdparts="CONFIG_MTDPARTS              \
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
 +      "bootargs_root=\0"
  
  /*
   * Ethernet Driver configuration
+--- a/configs/pogo_e02_defconfig
++++ b/configs/pogo_e02_defconfig
+@@ -16,6 +16,7 @@ CONFIG_CMD_PING=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_JFFS2=y
++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