uboot-kirkwood: update to 2020.04

[oweals/openwrt.git] / package / boot / uboot-kirkwood / patches / 200-openwrt-config.patch

diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
index f9aae0faafe34853c5a2b7e9b8d1fa2319e7467b..2ff4f2f184fd8b58f48fc054da7359430ff8d8a1 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@ -1,33 +1,43 @@
+--- a/arch/arm/mach-kirkwood/Kconfig
++++ b/arch/arm/mach-kirkwood/Kconfig
+@@ -103,4 +103,7 @@ source "board/alliedtelesis/SBx81LIFKW/K
+ source "board/alliedtelesis/SBx81LIFXCAT/Kconfig"
+ source "board/Marvell/db-88f6281-bp/Kconfig"
+
++config SECOND_STAGE
++      bool "OpenWrt second stage hack"
++
+ endif
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -114,4 +114,6 @@
- #define CONFIG_CMD_MTDPARTS
- #define CONFIG_LZO
- 
+@@ -60,4 +60,6 @@
+  * File system
+  */
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_DOCKSTAR_H */
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -144,4 +144,6 @@
- #define CONFIG_MTD_PARTITIONS
- #define CONFIG_CMD_MTDPARTS
- 
+@@ -77,4 +77,6 @@
+ #define CONFIG_RTC_MV
+ #endif /* CONFIG_CMD_DATE */
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_IB62x0_H */
 --- a/include/configs/iconnect.h
 +++ b/include/configs/iconnect.h
-@@ -117,4 +117,6 @@
- #define CONFIG_MTD_PARTITIONS
- #define CONFIG_CMD_MTDPARTS
- 
+@@ -67,4 +67,6 @@
+  * File system
+  */
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_ICONNECT_H */
 --- /dev/null
 +++ b/include/configs/openwrt-kirkwood-common.h
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,31 @@
 +/*
 + * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
 + *
@@ -37,18 +47,6 @@
 +#ifndef __OPENWRT_KIRKWOOD_COMMON_H
 +#define __OPENWRT_KIRKWOOD_COMMON_H
 +
-+/* Commands */
-+#define CONFIG_CMD_BOOTZ
-+
-+#if defined(CONFIG_CMD_NET)
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_PING
-+#endif
-+
-+/* Auto boot */
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY      3
-+
 +/* Ethernet */
 +#if defined(CONFIG_CMD_NET)
 +#define CONFIG_SERVERIP               192.168.1.2
@@ -62,17 +60,8 @@
 +#define CONFIG_ENV_IS_NOWHERE
 +#endif
 +
-+/* Flattened Device Tree */
-+#define CONFIG_OF_LIBFDT
-+
-+/* Flattened uImage Tree */
-+#define CONFIG_FIT
-+#define CONFIG_FIT_VERBOSE
-+
 +/* Various */
 +#define CONFIG_BZIP2
-+#define CONFIG_LZMA
-+#define CONFIG_LZO
 +
 +/* Unnecessary */
 +#undef CONFIG_BOOTM_NETBSD
@@ -82,19 +71,94 @@
 +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
 --- a/include/configs/pogo_e02.h
 +++ b/include/configs/pogo_e02.h
-@@ -114,4 +114,6 @@
- #define CONFIG_CMD_MTDPARTS
- #define CONFIG_LZO
- 
+@@ -66,4 +66,6 @@
+  * File system
+  */
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_POGO_E02_H */
---- a/include/configs/sheevaplug.h
-+++ b/include/configs/sheevaplug.h
-@@ -95,4 +95,6 @@
- #define CONFIG_CMD_MTDPARTS
- #define CONFIG_LZO
- 
+--- a/include/configs/goflexhome.h
++++ b/include/configs/goflexhome.h
+@@ -85,4 +85,6 @@
+ #define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+ #endif /*CONFIG_MVSATA_IDE*/
+
++#include "openwrt-kirkwood-common.h"
++
+ #endif /* _CONFIG_GOFLEXHOME_H */
+--- a/include/configs/nsa310.h
++++ b/include/configs/nsa310.h
+@@ -100,4 +100,6 @@
+ #define CONFIG_RTC_MV
+ #endif /* CONFIG_CMD_DATE */
+
 +#include "openwrt-kirkwood-common.h"
 +
- #endif /* _CONFIG_SHEEVAPLUG_H */
+ #endif /* _CONFIG_NSA310_H */
+--- a/configs/dockstar_defconfig
++++ b/configs/dockstar_defconfig
+@@ -38,3 +38,8 @@ CONFIG_SYS_NS16550=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
++CONFIG_LZMA=y
++CONFIG_LZO=y
+--- a/configs/goflexhome_defconfig
++++ b/configs/goflexhome_defconfig
+@@ -49,3 +49,8 @@ CONFIG_USB=y
+ CONFIG_DM_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
++CONFIG_LZMA=y
++CONFIG_LZO=y
+--- a/configs/ib62x0_defconfig
++++ b/configs/ib62x0_defconfig
+@@ -43,4 +43,7 @@ CONFIG_SYS_NS16550=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+ CONFIG_LZMA=y
++CONFIG_LZO=y
+--- a/configs/iconnect_defconfig
++++ b/configs/iconnect_defconfig
+@@ -39,4 +39,8 @@ CONFIG_SYS_NS16550=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+ CONFIG_LZMA=y
++CONFIG_LZO=y
+--- a/configs/nsa310_defconfig
++++ b/configs/nsa310_defconfig
+@@ -43,6 +43,9 @@ CONFIG_CMD_UBI=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+ CONFIG_LZMA=y
+ CONFIG_LZO=y
+ CONFIG_SYS_LONGHELP=y
+--- a/configs/pogo_e02_defconfig
++++ b/configs/pogo_e02_defconfig
+@@ -39,3 +39,8 @@ CONFIG_SYS_NS16550=y
+ CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
++CONFIG_CMD_BOOTZ=y
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
++CONFIG_LZMA=y
++CONFIG_LZO=y