OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -102,4 +102,7 @@ source "board/zyxel/nsa310/Kconfig"
+@@ -94,4 +94,7 @@ source "board/zyxel/nsa310/Kconfig"
- source "board/alliedtelesis/SBx81LIFKW/Kconfig"
+ source "board/zyxel/nsa310s/Kconfig"
- source "board/alliedtelesis/SBx81LIFXCAT/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
+@@ -68,4 +68,6 @@
-@@ -65,4 +65,6 @@
+ #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-  * File system
-  */
+ #define CONFIG_MTD_PARTITIONS
 +#include "openwrt-kirkwood-common.h"
++
  #endif /* _CONFIG_DOCKSTAR_H */
 --- a/include/configs/ib62x0.h
 +++ b/include/configs/ib62x0.h
-@@ -85,4 +85,6 @@
+@@ -87,4 +87,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
-@@ -72,4 +72,6 @@
+@@ -76,4 +76,6 @@
-  * File system
+ #define CONFIG_MTD_DEVICE
-  */
+ #define CONFIG_MTD_PARTITIONS
 +#undef CONFIG_BOOTM_RTEMS
++
 +#endif /* __OPENWRT_KIRKWOOD_COMMON_H */
 --- a/include/configs/pogo_e02.h
 +++ b/include/configs/pogo_e02.h
-@@ -72,4 +72,6 @@
+@@ -76,4 +76,6 @@
+ #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-  * File system
+ #define CONFIG_MTD_PARTITIONS
-  */
 +#include "openwrt-kirkwood-common.h"
++
  #endif /* _CONFIG_POGO_E02_H */
 --- a/include/configs/goflexhome.h
 +++ b/include/configs/goflexhome.h
-@@ -91,4 +91,6 @@
+@@ -101,4 +101,6 @@
- #define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+ #define CONFIG_RTC_MV
- #endif /*CONFIG_MVSATA_IDE*/
+ #endif /* CONFIG_CMD_DATE */
 +#include "openwrt-kirkwood-common.h"
++
  #endif /* _CONFIG_GOFLEXHOME_H */
 --- a/include/configs/nsa310.h
 +++ b/include/configs/nsa310.h
-@@ -114,4 +114,6 @@
+@@ -116,4 +116,6 @@
  #define CONFIG_RTC_MV
  #endif /* CONFIG_CMD_DATE */
 +#include "openwrt-kirkwood-common.h"
++
  #endif /* _CONFIG_NSA310_H */
---- a/configs/dockstar_defconfig
-+++ b/configs/dockstar_defconfig
+--- a/configs/dockstar_defconfig
-@@ -31,3 +31,8 @@ CONFIG_USB=y
++++ b/configs/dockstar_defconfig
+@@ -26,3 +26,8 @@ CONFIG_USB=y
- CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
- CONFIG_USB_STORAGE=y
+ CONFIG_OF_LIBFDT=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
+--- a/configs/goflexhome_defconfig
-@@ -40,3 +40,8 @@ CONFIG_USB=y
++++ b/configs/goflexhome_defconfig
+@@ -32,3 +32,8 @@ CONFIG_USB=y
- CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
- CONFIG_USB_STORAGE=y
+ CONFIG_OF_LIBFDT=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
-@@ -35,4 +35,7 @@ CONFIG_SYS_NS16550=y
+@@ -29,5 +29,8 @@ CONFIG_SYS_NS16550=y
  CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
- CONFIG_USB_STORAGE=y
+-CONFIG_LZMA=y
--CONFIG_LZMA=y
+ CONFIG_OF_LIBFDT=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_LZMA=y
 +CONFIG_LZO=y
 --- a/configs/iconnect_defconfig
 +++ b/configs/iconnect_defconfig
-@@ -31,4 +31,8 @@ CONFIG_SYS_NS16550=y
+@@ -25,5 +25,9 @@ CONFIG_SYS_NS16550=y
  CONFIG_USB=y
+ CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_STORAGE=y
- CONFIG_USB_STORAGE=y
+-CONFIG_LZMA=y
--CONFIG_LZMA=y
+ CONFIG_OF_LIBFDT=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
-@@ -35,6 +35,9 @@ CONFIG_CMD_UBI=y
+@@ -32,6 +32,9 @@ CONFIG_CMD_UBI=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_LZMA=y
  CONFIG_LZO=y
  CONFIG_SYS_LONGHELP=y
 --- a/configs/pogo_e02_defconfig
 +++ b/configs/pogo_e02_defconfig
-@@ -31,3 +31,8 @@ CONFIG_USB=y
+@@ -26,3 +26,8 @@ CONFIG_USB=y
- CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_STORAGE=y
+ CONFIG_OF_LIBFDT=y
 +CONFIG_CMD_BOOTZ=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_LZMA=y
 +CONFIG_LZO=y