projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1f5dd84107813c3087c13a8e1891946c1fc74d5e..fdc06d55978168a0c6c5ff515ccf28712b2ffbed 100644
(file)
--- a/
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/
package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@
-1,8
+1,8
@@
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -78,4 +78,7 @@ source "board/Seagate/nas220/Kconfig"
- source "board/zyxel/nsa310/Kconfig"
+@@ -87,4 +87,7 @@ source "board/Seagate/nas220/Kconfig"
source "board/zyxel/nsa310s/Kconfig"
source "board/zyxel/nsa310s/Kconfig"
+ source "board/zyxel/nsa325/Kconfig"
+config SECOND_STAGE
+ bool "OpenWrt second stage hack"
+config SECOND_STAGE
+ bool "OpenWrt second stage hack"
@@
-10,7
+10,7
@@
endif
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
endif
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
-@@ -
98,4 +98
,6 @@
+@@ -
89,4 +89
,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
@@
-19,7
+19,7
@@
#endif /* _CONFIG_DOCKSTAR_H */
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
#endif /* _CONFIG_DOCKSTAR_H */
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
-@@ -
108,4 +108
,6 @@
+@@ -
99,4 +99
,6 @@
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
@@
-28,7
+28,7
@@
#endif /* _CONFIG_IB62x0_H */
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
#endif /* _CONFIG_IB62x0_H */
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
-@@ -
103,4 +103
,6 @@
+@@ -
94,4 +94
,6 @@
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
#define CONFIG_MTD_PARTITIONS
#define CONFIG_CMD_MTDPARTS
@@
-80,7
+80,7
@@
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
+#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
-@@ -9
9,4 +99
,6 @@
+@@ -9
3,4 +93
,6 @@
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
#define CONFIG_CMD_MTDPARTS
#define CONFIG_LZO
@@
-89,7
+89,7
@@
#endif /* _CONFIG_POGO_E02_H */
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
#endif /* _CONFIG_POGO_E02_H */
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
-@@ -
109,4 +10
9,6 @@
+@@ -
99,4 +9
9,6 @@
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
#endif /* CONFIG_CMD_IDE */
#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET
#endif /* CONFIG_CMD_IDE */
@@
-98,7
+98,7
@@
#endif /* _CONFIG_SHEEVAPLUG_H */
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
#endif /* _CONFIG_SHEEVAPLUG_H */
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
-@@ -1
22,4 +12
2,6 @@
+@@ -1
12,4 +11
2,6 @@
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
#define CONFIG_RTC_MV
#endif /* CONFIG_CMD_DATE */
@@
-107,7
+107,7
@@
#endif /* _CONFIG_GOFLEXHOME_H */
--- a/include/configs/nsa310.h
+++ b/include/configs/nsa310.h
#endif /* _CONFIG_GOFLEXHOME_H */
--- a/include/configs/nsa310.h
+++ b/include/configs/nsa310.h
-@@ -16
6,4 +166
,6 @@
+@@ -16
5,4 +165
,6 @@
#define CONFIG_CMD_DNS
#endif /* CONFIG_CMD_DATE */
#define CONFIG_CMD_DNS
#endif /* CONFIG_CMD_DATE */