OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/arch/arm/mach-kirkwood/Kconfig 1 --- a/arch/arm/mach-kirkwood/Kconfig
2 +++ b/arch/arm/mach-kirkwood/Kconfig 2 +++ b/arch/arm/mach-kirkwood/Kconfig
3 @@ -68,6 +68,9 @@ config TARGET_SBx81LIFKW 3 @@ -62,6 +62,9 @@ config TARGET_NSA310
4 config TARGET_SBx81LIFXCAT 4 config TARGET_NSA310S
5 bool "Allied Telesis SBx81GP24/SBx81GT24" 5 bool "Zyxel NSA310S"
Line 6... Line 6...
6 6
7 +config TARGET_NSA325 7 +config TARGET_NSA325
8 + bool "Zyxel NSA325 board" 8 + bool "Zyxel NSA325 board"
9 + 9 +
Line 10... Line 10...
10 endchoice 10 endchoice
11 11
12 config SYS_SOC 12 config SYS_SOC
13 @@ -91,6 +94,7 @@ source "board/Seagate/goflexhome/Kconfig 13 @@ -85,5 +88,6 @@ source "board/Seagate/goflexhome/Kconfig
14 source "board/Seagate/nas220/Kconfig" 14 source "board/Seagate/nas220/Kconfig"
15 source "board/zyxel/nsa310/Kconfig" 15 source "board/zyxel/nsa310/Kconfig"
16 source "board/zyxel/nsa310s/Kconfig" -  
17 +source "board/zyxel/nsa325/Kconfig" -  
Line -... Line 16...
-   16 source "board/zyxel/nsa310s/Kconfig"
18 source "board/alliedtelesis/SBx81LIFKW/Kconfig" 17 +source "board/zyxel/nsa325/Kconfig"
19 source "board/alliedtelesis/SBx81LIFXCAT/Kconfig" 18
20 19 endif
21 --- /dev/null 20 --- /dev/null
22 +++ b/board/zyxel/nsa325/Kconfig 21 +++ b/board/zyxel/nsa325/Kconfig
Line 487... Line 486...
487 +#define BTN_COPY 37 486 +#define BTN_COPY 37
488 + 487 +
489 +#endif /* __NSA325_H */ 488 +#endif /* __NSA325_H */
490 --- /dev/null 489 --- /dev/null
491 +++ b/configs/nsa325_defconfig 490 +++ b/configs/nsa325_defconfig
492 @@ -0,0 +1,40 @@ 491 @@ -0,0 +1,37 @@
493 +CONFIG_ARM=y 492 +CONFIG_ARM=y
494 +CONFIG_KIRKWOOD=y 493 +CONFIG_KIRKWOOD=y
495 +CONFIG_SYS_TEXT_BASE=0x600000 494 +CONFIG_SYS_TEXT_BASE=0x600000
496 +CONFIG_TARGET_NSA325=y 495 +CONFIG_TARGET_NSA325=y
497 +CONFIG_IDENT_STRING="\nZyXEL NSA325 2-Bay Power Media Server" 496 +CONFIG_IDENT_STRING="\nZyXEL NSA325 2-Bay Power Media Server"
498 +CONFIG_NR_DRAM_BANKS=2 -  
499 +CONFIG_BOOTDELAY=3 497 +CONFIG_BOOTDELAY=3
500 +CONFIG_SYS_PROMPT="NSA325> " 498 +CONFIG_SYS_PROMPT="NSA325> "
501 +# CONFIG_CMD_IMLS is not set 499 +# CONFIG_CMD_IMLS is not set
502 +# CONFIG_CMD_FLASH is not set 500 +# CONFIG_CMD_FLASH is not set
503 +CONFIG_MVGBE=y -  
504 +CONFIG_MII=y -  
505 +CONFIG_SYS_NS16550=y 501 +CONFIG_SYS_NS16550=y
506 +CONFIG_CMD_FDT=y 502 +CONFIG_CMD_FDT=y
507 +CONFIG_OF_LIBFDT=y 503 +CONFIG_OF_LIBFDT=y
508 +CONFIG_CMD_SETEXPR=y 504 +CONFIG_CMD_SETEXPR=y
509 +CONFIG_CMD_DHCP=y 505 +CONFIG_CMD_DHCP=y
Line 530... Line 526...
530 +CONFIG_LZMA=y 526 +CONFIG_LZMA=y
531 +CONFIG_LZO=y 527 +CONFIG_LZO=y
532 +CONFIG_SYS_LONGHELP=y 528 +CONFIG_SYS_LONGHELP=y
533 --- /dev/null 529 --- /dev/null
534 +++ b/include/configs/nsa325.h 530 +++ b/include/configs/nsa325.h
535 @@ -0,0 +1,120 @@ 531 @@ -0,0 +1,122 @@
536 +/* 532 +/*
537 + * (C) Copyright 2016 bodhi <mibodhi@gmail.com> 533 + * (C) Copyright 2016 bodhi <mibodhi@gmail.com>
538 + * 534 + *
539 + * Based on 535 + * Based on
540 + * Copyright (C) 2014 Jason Plum <jplum@archlinuxarm.org> 536 + * Copyright (C) 2014 Jason Plum <jplum@archlinuxarm.org>
Line 640... Line 636...
640 +/* 636 +/*
641 + * File system 637 + * File system
642 + */ 638 + */
643 +#define CONFIG_JFFS2_NAND 639 +#define CONFIG_JFFS2_NAND
644 +#define CONFIG_JFFS2_LZO 640 +#define CONFIG_JFFS2_LZO
-   641 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-   642 +#define CONFIG_MTD_PARTITIONS
645 + 643 +
646 +/* 644 +/*
647 + * Date Time 645 + * Date Time
648 + */ 646 + */
649 +#ifdef CONFIG_CMD_DATE 647 +#ifdef CONFIG_CMD_DATE