aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-kirkwood/patches/120-iconnect.patch
diff options
context:
space:
mode:
authorPawel Dembicki <paweldembicki@gmail.com>2020-04-11 15:44:14 +0200
committerPetr Štetiar <ynezz@true.cz>2020-04-20 16:37:56 +0200
commit6cafea5c5ea92be0152f475467a2434c90d01891 (patch)
tree13610a020ede958cac6f25b0b9ca2f70587aa800 /package/boot/uboot-kirkwood/patches/120-iconnect.patch
parent29a458b0cae3435bce41136ee3b4132b4103ffae (diff)
downloadupstream-6cafea5c5ea92be0152f475467a2434c90d01891.tar.gz
upstream-6cafea5c5ea92be0152f475467a2434c90d01891.tar.bz2
upstream-6cafea5c5ea92be0152f475467a2434c90d01891.zip
uboot-kirkwood: update to 2020.04
Update U-Boot to current 2020.04 release for kirkwood platform. Catch up with upstream and move some configuration options from the header files to the corresponding defconfig files. Compile tested: all devices Run tested: nsa310, pogoplugv4 Tested-by: Cezary Jackiewicz <cezary@eko.one.pl> [nsa310] Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/120-iconnect.patch')
-rw-r--r--package/boot/uboot-kirkwood/patches/120-iconnect.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/package/boot/uboot-kirkwood/patches/120-iconnect.patch b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
index e7acf1a27f..770a52f737 100644
--- a/package/boot/uboot-kirkwood/patches/120-iconnect.patch
+++ b/package/boot/uboot-kirkwood/patches/120-iconnect.patch
@@ -1,14 +1,6 @@
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -42,24 +42,22 @@
- #define CONFIG_ENV_SECT_SIZE 0x20000
- #endif
- #define CONFIG_ENV_SIZE 0x20000
--#define CONFIG_ENV_OFFSET 0x80000
-+#define CONFIG_ENV_OFFSET 0xe0000
-
- /*
- * Default environment variables
+@@ -44,17 +44,15 @@
*/
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
@@ -32,7 +24,16 @@
* Ethernet driver configuration
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
-@@ -11,13 +11,14 @@ CONFIG_SYS_PROMPT="iconnect => "
+@@ -5,7 +5,7 @@ CONFIG_KIRKWOOD=y
+ CONFIG_SYS_TEXT_BASE=0x600000
+ CONFIG_TARGET_ICONNECT=y
+ CONFIG_ENV_SIZE=0x20000
+-CONFIG_ENV_OFFSET=0x80000
++CONFIG_ENV_OFFSET=0xE0000
+ CONFIG_NR_DRAM_BANKS=2
+ CONFIG_IDENT_STRING=" Iomega iConnect"
+ CONFIG_BOOTDELAY=3
+@@ -16,13 +16,14 @@ CONFIG_SYS_PROMPT="iconnect => "
CONFIG_CMD_NAND=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set