package/boot: update uboot-kirkwood to 2017.03

[openwrt/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 0e0dd02213c3c462d75e374ac79a3ee44bf1766b..fdc06d55978168a0c6c5ff515ccf28712b2ffbed 100644 (file)
--- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@ -1,43 +1,43 @@
---- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
-+++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
-@@ -84,4 +84,7 @@
- source "board/Seagate/dockstar/Kconfig"
- source "board/Seagate/goflexhome/Kconfig"
- 
+--- a/arch/arm/mach-kirkwood/Kconfig
++++ b/arch/arm/mach-kirkwood/Kconfig
+@@ -87,4 +87,7 @@ source "board/Seagate/nas220/Kconfig"
+ source "board/zyxel/nsa310s/Kconfig"
+ source "board/zyxel/nsa325/Kconfig"
+
 +config SECOND_STAGE
 +      bool "OpenWrt second stage hack"
 +
  endif
 --- a/include/configs/dockstar.h
 +++ b/include/configs/dockstar.h
-@@ -115,4 +115,6 @@
+@@ -89,4 +89,6 @@
  #define CONFIG_CMD_MTDPARTS
  #define CONFIG_LZO
- 
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_DOCKSTAR_H */
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -145,4 +145,6 @@
- #define CONFIG_MTD_PARTITIONS
- #define CONFIG_CMD_MTDPARTS
- 
+@@ -99,4 +99,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
-@@ -118,4 +118,6 @@
+@@ -94,4 +94,6 @@
  #define CONFIG_MTD_PARTITIONS
  #define CONFIG_CMD_MTDPARTS
- 
+
 +#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,40 @@
 +/*
 + * Copyright (C) 2013 Luka Perkov <luka@openwrt.org>
 + *
@@ -50,15 +50,6 @@
 +/* 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
@@ -72,12 +63,9 @@
 +#define CONFIG_ENV_IS_NOWHERE
 +#endif
 +
-+/* Flattened Device Tree */
-+#define CONFIG_OF_LIBFDT
-+
 +/* Flattened uImage Tree */
-+#define CONFIG_FIT
-+#define CONFIG_FIT_VERBOSE
++#define CONFIG_FIT                    1
++#define CONFIG_FIT_VERBOSE            1
 +
 +/* Various */
 +#define CONFIG_BZIP2
@@ -92,19 +80,37 @@
 +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
 --- a/include/configs/pogo_e02.h
 +++ b/include/configs/pogo_e02.h
-@@ -115,4 +115,6 @@
+@@ -93,4 +93,6 @@
  #define CONFIG_CMD_MTDPARTS
  #define CONFIG_LZO
- 
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_POGO_E02_H */
 --- a/include/configs/sheevaplug.h
 +++ b/include/configs/sheevaplug.h
-@@ -143,4 +143,6 @@
- #define CONFIG_CMD_MTDPARTS
- #define CONFIG_LZO
- 
+@@ -99,4 +99,6 @@
+ #define CONFIG_SYS_ATA_IDE1_OFFSET    MV_SATA_PORT1_OFFSET
+ #endif /* CONFIG_CMD_IDE */
+
 +#include "openwrt-kirkwood-common.h"
 +
  #endif /* _CONFIG_SHEEVAPLUG_H */
+--- a/include/configs/goflexhome.h
++++ b/include/configs/goflexhome.h
+@@ -112,4 +112,6 @@
+ #define CONFIG_RTC_MV
+ #endif /* CONFIG_CMD_DATE */
+
++#include "openwrt-kirkwood-common.h"
++
+ #endif /* _CONFIG_GOFLEXHOME_H */
+--- a/include/configs/nsa310.h
++++ b/include/configs/nsa310.h
+@@ -165,4 +165,6 @@
+ #define CONFIG_CMD_DNS
+ #endif /* CONFIG_CMD_DATE */
+
++#include "openwrt-kirkwood-common.h"
++
+ #endif /* _CONFIG_NSA310_H */