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 @@ -25,6 +25,9 @@ config TARGET_LSXL 3 @@ -25,6 +25,9 @@ config TARGET_LSXL
4 config TARGET_POGO_E02 4 config TARGET_POGO_E02
5 bool "pogo_e02 Board" 5 bool "pogo_e02 Board"
6   6
7 +config TARGET_POGOPLUGV4 7 +config TARGET_POGOPLUGV4
8 + bool "Pogoplug V4 Board" 8 + bool "Pogoplug V4 Board"
9 + 9 +
10 config TARGET_DNS325 10 config TARGET_DNS325
11 bool "dns325 Board" 11 bool "dns325 Board"
12   12
13 @@ -83,6 +86,7 @@ source "board/Marvell/guruplug/Kconfig" 13 @@ -77,6 +80,7 @@ source "board/Marvell/guruplug/Kconfig"
14 source "board/Marvell/sheevaplug/Kconfig" 14 source "board/Marvell/sheevaplug/Kconfig"
15 source "board/buffalo/lsxl/Kconfig" 15 source "board/buffalo/lsxl/Kconfig"
16 source "board/cloudengines/pogo_e02/Kconfig" 16 source "board/cloudengines/pogo_e02/Kconfig"
17 +source "board/cloudengines/pogoplugv4/Kconfig" 17 +source "board/cloudengines/pogoplugv4/Kconfig"
18 source "board/d-link/dns325/Kconfig" 18 source "board/d-link/dns325/Kconfig"
19 source "board/iomega/iconnect/Kconfig" 19 source "board/iomega/iconnect/Kconfig"
20 source "board/keymile/km_arm/Kconfig" 20 source "board/keymile/km_arm/Kconfig"
21 --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h 21 --- a/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
22 +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h 22 +++ b/arch/arm/mach-kirkwood/include/mach/kw88f6192.h
23 @@ -15,6 +15,6 @@ 23 @@ -16,6 +16,6 @@
24 #define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE 24 #define KW_REGS_PHY_BASE KW88F6192_REGS_PHYS_BASE
25   25
26 /* TCLK Core Clock defination */ 26 /* TCLK Core Clock defination */
27 -#define CONFIG_SYS_TCLK 166000000 /* 166MHz */ 27 -#define CONFIG_SYS_TCLK 166000000 /* 166MHz */
28 +#define CONFIG_SYS_TCLK 166666667 /* 166MHz */ 28 +#define CONFIG_SYS_TCLK 166666667 /* 166MHz */
29   29
30 #endif /* _CONFIG_KW88F6192_H */ 30 #endif /* _CONFIG_KW88F6192_H */
31 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h 31 --- a/arch/arm/mach-kirkwood/include/mach/mpp.h
32 +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h 32 +++ b/arch/arm/mach-kirkwood/include/mach/mpp.h
33 @@ -216,10 +216,12 @@ 33 @@ -217,10 +217,12 @@
34 #define MPP33_GPIO MPP( 33, 0x0, 1, 1, 0, 1, 1, 1 ) 34 #define MPP33_GPIO MPP( 33, 0x0, 1, 1, 0, 1, 1, 1 )
35 #define MPP33_TDM_DTX MPP( 33, 0x2, 0, 1, 0, 0, 1, 1 ) 35 #define MPP33_TDM_DTX MPP( 33, 0x2, 0, 1, 0, 0, 1, 1 )
36 #define MPP33_GE1_13 MPP( 33, 0x3, 0, 0, 0, 1, 1, 1 ) 36 #define MPP33_GE1_13 MPP( 33, 0x3, 0, 0, 0, 1, 1, 1 )
37 +#define MPP33_SATA1_ACTn MPP( 33, 0x5, 0, 1, 0, 1, 1, 1 ) 37 +#define MPP33_SATA1_ACTn MPP( 33, 0x5, 0, 1, 0, 1, 1, 1 )
38   38
39 #define MPP34_GPIO MPP( 34, 0x0, 1, 1, 0, 1, 1, 1 ) 39 #define MPP34_GPIO MPP( 34, 0x0, 1, 1, 0, 1, 1, 1 )
40 #define MPP34_TDM_SPI_CS1 MPP( 34, 0x2, 0, 1, 0, 0, 1, 1 ) 40 #define MPP34_TDM_SPI_CS1 MPP( 34, 0x2, 0, 1, 0, 0, 1, 1 )
41 #define MPP34_GE1_14 MPP( 34, 0x3, 0, 0, 0, 1, 1, 1 ) 41 #define MPP34_GE1_14 MPP( 34, 0x3, 0, 0, 0, 1, 1, 1 )
42 +#define MPP34_SATA1_ACTn MPP( 34, 0x5, 0, 1, 0, 1, 1, 1 ) 42 +#define MPP34_SATA1_ACTn MPP( 34, 0x5, 0, 1, 0, 1, 1, 1 )
43   43
44 #define MPP35_GPIO MPP( 35, 0x0, 1, 1, 1, 1, 1, 1 ) 44 #define MPP35_GPIO MPP( 35, 0x0, 1, 1, 1, 1, 1, 1 )
45 #define MPP35_TDM_CH0_TX_QL MPP( 35, 0x2, 0, 1, 0, 0, 1, 1 ) 45 #define MPP35_TDM_CH0_TX_QL MPP( 35, 0x2, 0, 1, 0, 0, 1, 1 )
46 --- /dev/null 46 --- /dev/null
47 +++ b/board/cloudengines/pogoplugv4/Kconfig 47 +++ b/board/cloudengines/pogoplugv4/Kconfig
48 @@ -0,0 +1,12 @@ 48 @@ -0,0 +1,12 @@
Line 530... Line 530...
530 +#define BTN_EJECT 29 530 +#define BTN_EJECT 29
531 + 531 +
532 +#endif /* __POGOPLUGV4_H */ 532 +#endif /* __POGOPLUGV4_H */
533 --- /dev/null 533 --- /dev/null
534 +++ b/configs/pogoplugv4_defconfig 534 +++ b/configs/pogoplugv4_defconfig
535 @@ -0,0 +1,43 @@ 535 @@ -0,0 +1,40 @@
536 +CONFIG_ARM=y 536 +CONFIG_ARM=y
537 +CONFIG_KIRKWOOD=y 537 +CONFIG_KIRKWOOD=y
538 +CONFIG_SYS_TEXT_BASE=0x600000 538 +CONFIG_SYS_TEXT_BASE=0x600000
539 +CONFIG_TARGET_POGOPLUGV4=y 539 +CONFIG_TARGET_POGOPLUGV4=y
540 +CONFIG_SYS_PROMPT="pogoplugv4> " 540 +CONFIG_SYS_PROMPT="pogoplugv4> "
541 +CONFIG_IDENT_STRING="\nPogoplug V4" 541 +CONFIG_IDENT_STRING="\nPogoplug V4"
542 +CONFIG_NR_DRAM_BANKS=2 -  
543 +CONFIG_BOOTDELAY=3 542 +CONFIG_BOOTDELAY=3
544 +# CONFIG_CMD_IMLS is not set 543 +# CONFIG_CMD_IMLS is not set
545 +# CONFIG_CMD_FLASH is not set 544 +# CONFIG_CMD_FLASH is not set
546 +CONFIG_MVGBE=y -  
547 +CONFIG_MII=y -  
548 +CONFIG_SYS_NS16550=y 545 +CONFIG_SYS_NS16550=y
549 +CONFIG_CMD_FDT=y 546 +CONFIG_CMD_FDT=y
550 +CONFIG_OF_LIBFDT=y 547 +CONFIG_OF_LIBFDT=y
551 +CONFIG_OF_BOOTZ=y 548 +CONFIG_OF_BOOTZ=y
552 +CONFIG_CMD_SETEXPR=y 549 +CONFIG_CMD_SETEXPR=y
Line 576... Line 573...
576 +CONFIG_LZMA=y 573 +CONFIG_LZMA=y
577 +CONFIG_LZO=y 574 +CONFIG_LZO=y
578 +CONFIG_SYS_LONGHELP=y 575 +CONFIG_SYS_LONGHELP=y
579 --- a/drivers/gpio/kw_gpio.c 576 --- a/drivers/gpio/kw_gpio.c
580 +++ b/drivers/gpio/kw_gpio.c 577 +++ b/drivers/gpio/kw_gpio.c
581 @@ -147,3 +147,36 @@ void kw_gpio_set_blink(unsigned pin, int 578 @@ -148,3 +148,36 @@ void kw_gpio_set_blink(unsigned pin, int
582 /* Set blinking. */ 579 /* Set blinking. */
583 __set_blinking(pin, blink); 580 __set_blinking(pin, blink);
584 } 581 }
585 + 582 +
586 + 583 +
Line 620... Line 617...
620 @@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TANGIER) += tang 617 @@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TANGIER) += tang
621 obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o 618 obj-$(CONFIG_MMC_SDHCI_TEGRA) += tegra_mmc.o
622 obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o 619 obj-$(CONFIG_MMC_SDHCI_XENON) += xenon_sdhci.o
623 obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o 620 obj-$(CONFIG_MMC_SDHCI_ZYNQ) += zynq_sdhci.o
624 +obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o 621 +obj-$(CONFIG_KIRKWOOD_MMC) += kirkwood_mmc.o
625   622
626 obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o 623 obj-$(CONFIG_MMC_SUNXI) += sunxi_mmc.o
627 obj-$(CONFIG_MMC_UNIPHIER) += tmio-common.o uniphier-sd.o 624 obj-$(CONFIG_MMC_UNIPHIER) += uniphier-sd.o
628 --- /dev/null 625 --- /dev/null
629 +++ b/drivers/mmc/kirkwood_mmc.c 626 +++ b/drivers/mmc/kirkwood_mmc.c
630 @@ -0,0 +1,482 @@ 627 @@ -0,0 +1,482 @@
631 +/* 628 +/*
632 + * (C) Copyright 2014 bodhi <mibodhi@gmail.com> 629 + * (C) Copyright 2014 bodhi <mibodhi@gmail.com>
Line 1110... Line 1107...
1110 + 1107 +
1111 + return 0; 1108 + return 0;
1112 +} 1109 +}
1113 --- a/include/configs/mv-common.h 1110 --- a/include/configs/mv-common.h
1114 +++ b/include/configs/mv-common.h 1111 +++ b/include/configs/mv-common.h
1115 @@ -77,4 +77,10 @@ 1112 @@ -117,4 +117,10 @@
1116 #define CONFIG_SYS_MAX_NAND_DEVICE 1 1113 #define CONFIG_MTD_PARTITIONS
1117 #endif 1114 #endif
1118   1115
1119 +/* 1116 +/*
1120 + * Kirkwood MMC 1117 + * Kirkwood MMC
1121 + */ 1118 + */
1122 +#if defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC) 1119 +#if defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC)
1123 +#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE 1120 +#define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
1124 +#endif /* defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC) */ 1121 +#endif /* defined(CONFIG_KIRKWOOD) && defined(CONFIG_CMD_MMC) */
1125 #endif /* _MV_COMMON_H */ 1122 #endif /* _MV_COMMON_H */
1126 --- /dev/null 1123 --- /dev/null
1127 +++ b/include/configs/pogoplugv4.h 1124 +++ b/include/configs/pogoplugv4.h
1128 @@ -0,0 +1,127 @@ 1125 @@ -0,0 +1,129 @@
1129 +/* 1126 +/*
1130 + * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com> 1127 + * Copyright (C) 2014-2016 bodhi <mibodhi@gmail.com>
1131 + * Based on 1128 + * Based on
1132 + * 1129 + *
1133 + * Copyright (C) 2012 1130 + * Copyright (C) 2012
Line 1230... Line 1227...
1230 +/* 1227 +/*
1231 + * File system 1228 + * File system
1232 + */ 1229 + */
1233 +#define CONFIG_JFFS2_NAND 1230 +#define CONFIG_JFFS2_NAND
1234 +#define CONFIG_JFFS2_LZO 1231 +#define CONFIG_JFFS2_LZO
-   1232 +#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-   1233 +#define CONFIG_MTD_PARTITIONS
1235 + 1234 +
1236 +/* 1235 +/*
1237 + * SATA 1236 + * SATA
1238 + */ 1237 + */
1239 +#ifdef CONFIG_MVSATA_IDE 1238 +#ifdef CONFIG_MVSATA_IDE