OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 26... Line 26...
26 --- a/arch/arm/mach-kirkwood/Kconfig 26 --- a/arch/arm/mach-kirkwood/Kconfig
27 +++ b/arch/arm/mach-kirkwood/Kconfig 27 +++ b/arch/arm/mach-kirkwood/Kconfig
28 @@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME 28 @@ -56,6 +56,9 @@ config TARGET_GOFLEXHOME
29 config TARGET_NAS220 29 config TARGET_NAS220
30 bool "BlackArmor NAS220" 30 bool "BlackArmor NAS220"
31   31
32 +config TARGET_NSA310 32 +config TARGET_NSA310
33 + bool "Zyxel NSA310 Board" 33 + bool "Zyxel NSA310 Board"
34 + 34 +
35 config TARGET_NSA310S 35 config TARGET_NSA310S
36 bool "Zyxel NSA310S" 36 bool "Zyxel NSA310S"
37   37
38 @@ -86,6 +89,7 @@ source "board/raidsonic/ib62x0/Kconfig" 38 @@ -80,6 +83,7 @@ source "board/raidsonic/ib62x0/Kconfig"
39 source "board/Seagate/dockstar/Kconfig" 39 source "board/Seagate/dockstar/Kconfig"
40 source "board/Seagate/goflexhome/Kconfig" 40 source "board/Seagate/goflexhome/Kconfig"
41 source "board/Seagate/nas220/Kconfig" 41 source "board/Seagate/nas220/Kconfig"
42 +source "board/zyxel/nsa310/Kconfig" 42 +source "board/zyxel/nsa310/Kconfig"
43 source "board/zyxel/nsa310s/Kconfig" 43 source "board/zyxel/nsa310s/Kconfig"
-   44
44 source "board/alliedtelesis/SBx81LIFKW/Kconfig" 45 endif
45 source "board/alliedtelesis/SBx81LIFXCAT/Kconfig" -  
46 --- /dev/null 46 --- /dev/null
47 +++ b/board/zyxel/nsa310/Kconfig 47 +++ b/board/zyxel/nsa310/Kconfig
48 @@ -0,0 +1,12 @@ 48 @@ -0,0 +1,12 @@
49 +if TARGET_NSA310 49 +if TARGET_NSA310
50 + 50 +
Line 503... Line 503...
503 +#define MV88E1318_RGMII_RXTM_CTRL (1 << 5) 503 +#define MV88E1318_RGMII_RXTM_CTRL (1 << 5)
504 + 504 +
505 +#endif /* __NSA310_H */ 505 +#endif /* __NSA310_H */
506 --- /dev/null 506 --- /dev/null
507 +++ b/configs/nsa310_defconfig 507 +++ b/configs/nsa310_defconfig
508 @@ -0,0 +1,40 @@ 508 @@ -0,0 +1,37 @@
509 +CONFIG_ARM=y 509 +CONFIG_ARM=y
510 +CONFIG_KIRKWOOD=y 510 +CONFIG_KIRKWOOD=y
511 +CONFIG_SYS_TEXT_BASE=0x600000 511 +CONFIG_SYS_TEXT_BASE=0x600000
512 +CONFIG_TARGET_NSA310=y 512 +CONFIG_TARGET_NSA310=y
513 +CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server" 513 +CONFIG_IDENT_STRING="\nZyXEL NSA310 1-Bay Power Media Server"
514 +CONFIG_NR_DRAM_BANKS=2 -  
515 +CONFIG_BOOTDELAY=3 514 +CONFIG_BOOTDELAY=3
516 +CONFIG_SYS_PROMPT="NSA310> " 515 +CONFIG_SYS_PROMPT="NSA310> "
517 +# CONFIG_CMD_IMLS is not set 516 +# CONFIG_CMD_IMLS is not set
518 +# CONFIG_CMD_FLASH is not set 517 +# CONFIG_CMD_FLASH is not set
519 +CONFIG_MVGBE=y -  
520 +CONFIG_MII=y -  
521 +CONFIG_SYS_NS16550=y 518 +CONFIG_SYS_NS16550=y
522 +CONFIG_CMD_FDT=y 519 +CONFIG_CMD_FDT=y
523 +CONFIG_OF_LIBFDT=y 520 +CONFIG_OF_LIBFDT=y
524 +CONFIG_CMD_SETEXPR=y 521 +CONFIG_CMD_SETEXPR=y
525 +CONFIG_CMD_DHCP=y 522 +CONFIG_CMD_DHCP=y
Line 546... Line 543...
546 +CONFIG_LZMA=y 543 +CONFIG_LZMA=y
547 +CONFIG_LZO=y 544 +CONFIG_LZO=y
548 +CONFIG_SYS_LONGHELP=y 545 +CONFIG_SYS_LONGHELP=y
549 --- /dev/null 546 --- /dev/null
550 +++ b/include/configs/nsa310.h 547 +++ b/include/configs/nsa310.h
551 @@ -0,0 +1,117 @@ 548 @@ -0,0 +1,119 @@
552 +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com> 549 +/* Copyright (C) 2015-2016 bodhi <mibodhi@gmail.com>
553 + * 550 + *
554 + * Based on 551 + * Based on
555 + * Copyright (C) 2012 Peter Schildmann <linux@schildmann.info> 552 + * Copyright (C) 2012 Peter Schildmann <linux@schildmann.info>
556 + * 553 + *
Line 655... Line 652...
655 +/* 652 +/*
656 + * File system 653 + * File system
657 + */ 654 + */
658 +#define CONFIG_JFFS2_NAND 655 +#define CONFIG_JFFS2_NAND
659 +#define CONFIG_JFFS2_LZO 656 +#define CONFIG_JFFS2_LZO
-   657 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-   658 +#define CONFIG_MTD_PARTITIONS
660 + 659 +
661 +/* 660 +/*
662 + * Date Time 661 + * Date Time
663 + */ 662 + */
664 +#ifdef CONFIG_CMD_DATE 663 +#ifdef CONFIG_CMD_DATE