diff options
| author | Pawel Dembicki <paweldembicki@gmail.com> | 2020-04-11 15:44:14 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-04-20 16:37:56 +0200 |
| commit | 6cafea5c5ea92be0152f475467a2434c90d01891 (patch) | |
| tree | 13610a020ede958cac6f25b0b9ca2f70587aa800 /package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch | |
| parent | 29a458b0cae3435bce41136ee3b4132b4103ffae (diff) | |
| download | upstream-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/007-nsa310-uboot-generic.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch index 25d252d13f..09dc587bf7 100644 --- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch +++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch @@ -25,7 +25,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig -@@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME +@@ -53,6 +53,9 @@ config TARGET_GOFLEXHOME config TARGET_NAS220 bool "BlackArmor NAS220" @@ -505,8 +505,10 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +#endif /* __NSA310_H */ --- /dev/null +++ b/configs/nsa310_defconfig -@@ -0,0 +1,40 @@ +@@ -0,0 +1,48 @@ +CONFIG_ARM=y ++CONFIG_SYS_DCACHE_OFF=y ++CONFIG_ARCH_CPU_INIT=y +CONFIG_KIRKWOOD=y +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_NSA310=y @@ -533,12 +535,18 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_JFFS2=y ++CONFIG_MTD=y ++CONFIG_MTD_RAW_NAND=y +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0x0c0000(uboot),0x80000(uboot_env),0x7ec0000(ubi)" +CONFIG_CMD_MTDPARTS=y +CONFIG_CMD_ENV=y +CONFIG_CMD_NAND=y +CONFIG_EFI_PARTITION=y +CONFIG_ENV_IS_IN_NAND=y ++CONFIG_ENV_SIZE=0x20000 ++CONFIG_ENV_OFFSET=0xC0000 ++CONFIG_ENV_SECT_SIZE=0x20000 ++CONFIG_ENV_ADDR=0xC0000 +CONFIG_CMD_UBI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y @@ -548,7 +556,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +CONFIG_SYS_LONGHELP=y --- /dev/null +++ b/include/configs/nsa310.h -@@ -0,0 +1,117 @@ +@@ -0,0 +1,103 @@ +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com> + * + * Based on @@ -606,20 +614,6 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +#include "mv-common.h" + +/* -+ * Environment variables configurations -+ */ -+#ifdef CONFIG_CMD_NAND -+#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ -+#endif -+ -+/* max 4k env size is enough, but in case of nand -+ * it has to be rounded to sector size -+ */ -+#define CONFIG_ENV_SIZE 0x20000 /* 128k */ -+#define CONFIG_ENV_ADDR 0xc0000 -+#define CONFIG_ENV_OFFSET 0xc0000 /* env starts here */ -+ -+/* + * Default environment variables + */ +#define CONFIG_BOOTCOMMAND \ |