uboot-kirkwood: update to 2020.04

[openwrt/openwrt.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 b8c9c12ba747cfa4772ece8c9987b67b201adbd4..d077915c93043621f138edc34b63b6857b0df48e 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
+++ b/package/boot/uboot-kirkwood/patches/140-pogoplug_e02.patch
@@ -1,45 +1,18 @@
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -168,6 +168,7 @@ Active  arm         arm926ejs      davin
- Active  arm         arm926ejs      kirkwood    buffalo         lsxl                lschlv2                              lsxl:LSCHLV2                                                                                                                      Michael Walle <michael@walle.cc>
- Active  arm         arm926ejs      kirkwood    buffalo         lsxl                lsxhl                                lsxl:LSXHL                                                                                                                        Michael Walle <michael@walle.cc>
- Active  arm         arm926ejs      kirkwood    cloudengines    -                   pogo_e02                             -                                                                                                                                 Dave Purdy <david.c.purdy@gmail.com>
-+Active  arm         arm926ejs      kirkwood    cloudengines    pogo_e02            pogo_e02_second_stage                pogo_e02:SECOND_STAGE                                                                                                             Felix Kaechele <felix@fetzig.org>
- Active  arm         arm926ejs      kirkwood    d-link          -                   dns325                               -                                                                                                                                 Stefan Herbrechtsmeier <stefan@code.herbrechtsmeier.net>
- Active  arm         arm926ejs      kirkwood    iomega          -                   iconnect                             -                                                                                                                                 Luka Perkov <luka@openwrt.org>
- Active  arm         arm926ejs      kirkwood    iomega          iconnect            iconnect_second_stage                iconnect:SECOND_STAGE                                                                                                             Luka Perkov <luka@openwrt.org>
 --- a/include/configs/pogo_e02.h
 +++ b/include/configs/pogo_e02.h
-@@ -62,23 +62,35 @@
- #endif
- 
- #define CONFIG_ENV_SIZE                       0x20000 /* 128k */
--#define CONFIG_ENV_OFFSET             0x60000 /* env starts here */
-+#define CONFIG_ENV_OFFSET             0xe0000 /* env starts here */
- 
- /*
+@@ -42,17 +42,17 @@
   * Default environment variables
   */
  #define CONFIG_BOOTCOMMAND \
 -      "setenv bootargs $(bootargs_console); " \
 -      "run bootcmd_usb; " \
 -      "bootm 0x00800000 0x01100000"
-+      "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
-+      "ubi part root; " \
-+      "ubifsmount ubi:rootfs; " \
-+      "ubifsload 0x800000 ${kernel}; " \
-+      "ubifsload 0x700000 ${fdt}; " \
-+      "ubifsumount; " \
-+      "fdt addr 0x700000; fdt resize; fdt chosen; " \
-+      "bootz 0x800000 - 0x700000"
-+
-+#define CONFIG_MTDPARTS \
-+      "mtdparts=orion_nand:" \
-+      "0xe0000@0x0(uboot)," \
-+      "0x20000@0xe0000(uboot_env)," \
-+      "0x100000@0x100000(second_stage_uboot)," \
-+      "-@0x200000(root)\0"
- 
++      "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; "     \
++      "ubi part ubi; "                                                \
++      "ubifsmount ubi:rootfs; "                                       \
++      "ubi read 0x800000 kernel; "                                    \
++      "bootm 0x800000"
+
  #define CONFIG_EXTRA_ENV_SETTINGS \
 -      "mtdparts=mtdparts=orion_nand:1M(u-boot),4M(uImage)," \
 -      "32M(rootfs),-(data)\0"\
@@ -49,10 +22,27 @@
 -      "ext2load usb 0:1 0x01100000 /uInitrd\0"
 +      "console=console=ttyS0,115200\0"        \
 +      "mtdids=nand0=orion_nand\0"             \
-+      "mtdparts="CONFIG_MTDPARTS              \
-+      "kernel=/boot/zImage\0"                 \
-+      "fdt=/boot/pogo_e02.dtb\0"              \
-+      "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
- 
++      "mtdparts="CONFIG_MTDPARTS_DEFAULT "\0" \
++      "bootargs_root=\0"
+
  /*
   * Ethernet Driver configuration
+--- a/configs/pogo_e02_defconfig
++++ b/configs/pogo_e02_defconfig
+@@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
+ CONFIG_SYS_TEXT_BASE=0x600000
+ CONFIG_TARGET_POGO_E02=y
+ CONFIG_ENV_SIZE=0x20000
+-CONFIG_ENV_OFFSET=0x60000
++CONFIG_ENV_OFFSET=0xE0000
+ CONFIG_NR_DRAM_BANKS=2
+ CONFIG_IDENT_STRING="\nPogo E02"
+ CONFIG_BOOTDELAY=3
+@@ -23,6 +23,7 @@ CONFIG_CMD_EXT2=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@0x100000(second_stage_uboot),-@0x200000(ubi)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ISO_PARTITION=y
+ CONFIG_OF_CONTROL=y