Am Tue, 29 Sep 2015 12:00:02 +0200
schrieb openwrt-devel-requ...@lists.openwrt.org:

> Send openwrt-devel mailing list submissions to
>       openwrt-devel@lists.openwrt.org
> 
> To subscribe or unsubscribe via the World Wide Web, visit
>       https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> or, via email, send a message with subject or body 'help' to
>       openwrt-devel-requ...@lists.openwrt.org
> 
> You can reach the person managing the list at
>       openwrt-devel-ow...@lists.openwrt.org
> 
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of openwrt-devel digest..."
> 
> 
> Today's Topics:
> 
>    1. [PATCH v2] ar71xx: add support for TP-LINK      TL-WR941ND v6
>       (international version) (Matthias Schiffer)
>    2. Re: [PATCH netifd] netifd-proto.sh: add table argument to
>       proto_add_ipv4_route() (Alexander Couzens)
> 
> 
> ----------------------------------------------------------------------
> 
> Message: 1
> Date: Tue, 29 Sep 2015 11:20:04 +0900
> From: Matthias Schiffer <mschif...@universe-factory.net>
> To: openwrt-devel@lists.openwrt.org
> Subject: [OpenWrt-Devel] [PATCH v2] ar71xx: add support for TP-LINK
>       TL-WR941ND v6 (international version)
> Message-ID:
>       
> <e815de10080a08b093318bb3534608ba67032724.1443493192.git.mschif...@universe-factory.net>
>       
> 
> The international version is completely different from the already
> supported Chinese version. The WLAN of the QCA956x SoC used by this router
> has been fixed in r46948.
> 
> Signed-off-by: Matthias Schiffer <mschif...@universe-factory.net>
> ---
> v2: rebased on top of trunk + http://patchwork.ozlabs.org/patch/523133/    
>                                                                               
>  
> The 700-MIPS-ath79-openwrt-machines.patch should only be ~10 added lines,  
> but git gets confused and makes the diff completely
> incomprehensible...        
> 
> 
>  target/linux/ar71xx/base-files/etc/diag.sh         |   3 +-
>  .../ar71xx/base-files/etc/uci-defaults/01_leds     |   9 ++
>  .../ar71xx/base-files/etc/uci-defaults/02_network  |   1 +
>  target/linux/ar71xx/base-files/lib/ar71xx.sh       |   3 +
>  .../lib/preinit/05_set_preinit_iface_ar71xx        |   1 +
>  .../ar71xx/base-files/lib/upgrade/platform.sh      |   1 +
>  target/linux/ar71xx/config-4.1                     |   1 +
>  .../files/arch/mips/ath79/mach-tl-wr941nd-v6.c     | 151 +++++++++++++++++++
>  target/linux/ar71xx/image/Makefile                 |   9 +-
>  .../700-MIPS-ath79-openwrt-machines.patch          | 166
> +++++++++++---------- 10 files changed, 266 insertions(+), 79 deletions(-)
>  create mode 100644
> target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c
> 
> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
> b/target/linux/ar71xx/base-files/etc/diag.sh index cfba6b4..d97de9f 100644
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -287,7 +287,8 @@ get_status_led() {
>       tl-wdr4300 | \
>       tl-wr703n | \
>       tl-wr710n | \
> -     tl-wr720n-v3)
> +     tl-wr720n-v3 | \
> +     tl-wr941nd-v6)
>               status_led="tp-link:blue:system"
>               ;;
>       tl-wr841n-v9)
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
> b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index
> fac4751..e8ee929 100644 ---
> a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++
> b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -503,6 +503,15
> @@ tl-wr941nd-v5) ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan"
> "phy0tpt" ;;
>  
> +tl-wr941nd-v6)
> +     ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth0"
> +     ucidef_set_led_switch "lan1" "LAN1" "tp-link:blue:lan1" "switch0"
> "0x10"
> +     ucidef_set_led_switch "lan2" "LAN2" "tp-link:blue:lan2" "switch0"
> "0x08"
> +     ucidef_set_led_switch "lan3" "LAN3" "tp-link:blue:lan3" "switch0"
> "0x04"
> +     ucidef_set_led_switch "lan4" "LAN4" "tp-link:blue:lan4" "switch0"
> "0x02"
> +     ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt"
> +     ;;
> +
>  tl-wa830re-v2)
>       ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
>       ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
> diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
> b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index
> 880953c..35cd05d 100644 ---
> a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++
> b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -242,6 +242,7
> @@ tl-mr3420-v2 |\ tl-wr841n-v8 |\
>  tl-wr842n-v2 |\
>  tl-wr941nd-v5 |\
> +tl-wr941nd-v6 |\
>  tl-wdr6500-v2 |\
>  wnr2000-v3 |\
>  wnr2000-v4 |\
> diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> b/target/linux/ar71xx/base-files/lib/ar71xx.sh index ad98cfb..6dba074 100755
> --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
> +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
> @@ -820,6 +820,9 @@ ar71xx_board_detect() {
>       *"TL-WR941N/ND v5")
>               name="tl-wr941nd-v5"
>               ;;
> +     *"TL-WR941N/ND v6")
> +             name="tl-wr941nd-v6"
> +             ;;
>       *"TL-WR703N v1")
>               name="tl-wr703n"
>               ;;
> diff --git
> a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
> b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
> index d214e9b..38a0382 100644 ---
> a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx +++
> b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx @@
> -36,6 +36,7 @@ set_preinit_iface() { tl-wr720n-v3 |\ tl-wr841n-v8 |\
>       tl-wr842n-v2 |\
> +     tl-wr941nd-v6 |\
>       wnr2000-v3 |\
>       wnr2200 |\
>       wnr612-v2 |\
> diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index
> c947b78..e757237 100755 ---
> a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++
> b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -360,6 +360,7 @@
> platform_check_image() { tl-wr842n-v2 | \
>       tl-wr941nd | \
>       tl-wr941nd-v5 | \
> +     tl-wr941nd-v6 | \
>       tl-wr1041n-v2 | \
>       tl-wr1043nd | \
>       tl-wr1043nd-v2 | \
> diff --git a/target/linux/ar71xx/config-4.1 b/target/linux/ar71xx/config-4.1
> index 50dc7b2..e0cb65b 100644
> --- a/target/linux/ar71xx/config-4.1
> +++ b/target/linux/ar71xx/config-4.1
> @@ -140,6 +140,7 @@ CONFIG_ATH79_MACH_TL_WR841N_V1=y
>  CONFIG_ATH79_MACH_TL_WR841N_V8=y
>  CONFIG_ATH79_MACH_TL_WR841N_V9=y
>  CONFIG_ATH79_MACH_TL_WR941ND=y
> +CONFIG_ATH79_MACH_TL_WR941ND_V6=y
>  CONFIG_ATH79_MACH_TUBE2H=y
>  CONFIG_ATH79_MACH_UBNT=y
>  CONFIG_ATH79_MACH_UBNT_XM=y
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c
> b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c new file
> mode 100644 index 0000000..55b4c00
> --- /dev/null
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr941nd-v6.c
> @@ -0,0 +1,151 @@
> +/*
> + *  TP-LINK TL-WR941N/ND v6 board support
> + *
> + *  Copyright (C) 2015 Matthias Schiffer <mschif...@universe-factory.net>
> + *
> + *  This program is free software; you can redistribute it and/or modify it
> + *  under the terms of the GNU General Public License version 2 as published
> + *  by the Free Software Foundation.
> + */
> +
> +#include <linux/gpio.h>
> +#include <linux/platform_device.h>
> +
> +#include <asm/mach-ath79/ath79.h>
> +#include <asm/mach-ath79/ar71xx_regs.h>
> +
> +#include "common.h"
> +#include "dev-eth.h"
> +#include "dev-gpio-buttons.h"
> +#include "dev-leds-gpio.h"
> +#include "dev-m25p80.h"
> +#include "dev-wmac.h"
> +#include "machtypes.h"
> +
> +
> +#define TL_WR941ND_V6_GPIO_LED_QSS           3
> +#define TL_WR941ND_V6_GPIO_LED_WAN           14
> +#define TL_WR941ND_V6_GPIO_LED_WAN_RED               15
> +#define TL_WR941ND_V6_GPIO_LED_LAN1          7
> +#define TL_WR941ND_V6_GPIO_LED_LAN2          6
> +#define TL_WR941ND_V6_GPIO_LED_LAN3          5
> +#define TL_WR941ND_V6_GPIO_LED_LAN4          4
> +#define TL_WR941ND_V6_GPIO_LED_WLAN          8
> +#define TL_WR941ND_V6_GPIO_LED_SYSTEM                18
> +
> +#define TL_WR941ND_V6_GPIO_BTN_RESET         1
> +#define TL_WR941ND_V6_GPIO_BTN_RFKILL                2
> +
> +#define TL_WR941ND_V6_KEYS_POLL_INTERVAL     20
> +#define TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL (3 *
> TL_WR941ND_V6_KEYS_POLL_INTERVAL) +
> +
> +static struct gpio_led tl_wr941nd_v6_leds_gpio[] __initdata = {
> +     {
> +             .name           = "tp-link:blue:qss",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_QSS,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:wan",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_WAN,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:red:wan",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_WAN_RED,
> +             .active_low     = 0,
> +     },
> +     {
> +             .name           = "tp-link:blue:lan1",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_LAN1,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:lan2",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_LAN2,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:lan3",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_LAN3,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:lan4",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_LAN4,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:wlan",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_WLAN,
> +             .active_low     = 1,
> +     },
> +     {
> +             .name           = "tp-link:blue:system",
> +             .gpio           = TL_WR941ND_V6_GPIO_LED_SYSTEM,
> +             .active_low     = 1,
> +     },
> +};
> +
> +static struct gpio_keys_button tl_wr941nd_v6_gpio_keys[] __initdata = {
> +     {
> +             .desc           = "Reset button",
> +             .type           = EV_KEY,
> +             .code           = KEY_RESTART,
> +             .debounce_interval = TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL,
> +             .gpio           = TL_WR941ND_V6_GPIO_BTN_RESET,
> +             .active_low     = 1,
> +     }, {
> +             .desc           = "RFKILL button",
> +             .type           = EV_KEY,
> +             .code           = KEY_RFKILL,
> +             .debounce_interval = TL_WR941ND_V6_KEYS_DEBOUNCE_INTERVAL,
> +             .gpio           = TL_WR941ND_V6_GPIO_BTN_RFKILL,
> +             .active_low     = 1,
> +     }
> +};
> +
> +
> +static const char *tl_wr941n_v6_part_probes[] = {
> +     "tp-link",
> +     NULL,
> +};
> +
> +static struct flash_platform_data tl_wr941n_v6_flash_data = {
> +     .part_probes    = tl_wr941n_v6_part_probes,
> +};
> +
> +
> +static void __init tl_wr941nd_v6_setup(void)
> +{
> +     u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
> +     u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
> +
> +     ath79_register_m25p80(&tl_wr941n_v6_flash_data);
> +
> +     ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_v6_leds_gpio),
> +                              tl_wr941nd_v6_leds_gpio);
> +
> +     ath79_register_gpio_keys_polled(-1, TL_WR941ND_V6_KEYS_POLL_INTERVAL,
> +                                     ARRAY_SIZE(tl_wr941nd_v6_gpio_keys),
> +                                     tl_wr941nd_v6_gpio_keys);
> +
> +     ath79_register_mdio(0, 0x0);
> +
> +     ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
> +     ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
> +
> +     ath79_switch_data.phy4_mii_en = 1;
> +     ath79_switch_data.phy_poll_mask = BIT(0);
> +     ath79_eth0_data.phy_mask = BIT(0);
> +
> +     ath79_register_eth(0);
> +     ath79_register_eth(1);
> +
> +     ath79_register_wmac(ee, mac);
> +
> +}
> +
> +MIPS_MACHINE(ATH79_MACH_TL_WR941ND_V6, "TL-WR941ND-v6", "TP-LINK
> TL-WR941N/ND v6",
> +          tl_wr941nd_v6_setup);
> diff --git a/target/linux/ar71xx/image/Makefile
> b/target/linux/ar71xx/image/Makefile index b5fc396..1cccce7 100644
> --- a/target/linux/ar71xx/image/Makefile
> +++ b/target/linux/ar71xx/image/Makefile
> @@ -677,6 +677,13 @@ define Device/tl-wr941nd-v5
>      TPLINK_HWID := 0x09410005
>  endef
>  
> +define Device/tl-wr941nd-v6
> +    $(Device/tplink-4mlzma)
> +    BOARDNAME := TL-WR941ND-v6
> +    DEVICE_PROFILE := TLWR941
> +    TPLINK_HWID := 0x09410006
> +endef
> +
>  # Chinese version (unline European) is similar to the TL-WDR3500
>  define Device/tl-wr941nd-v6-cn
>      $(Device/tplink-4mlzma)
> @@ -684,7 +691,7 @@ define Device/tl-wr941nd-v6-cn
>      DEVICE_PROFILE := TLWR941
>      TPLINK_HWID := 0x09410006
>  endef
> -TARGET_DEVICES += tl-wr941nd-v5 tl-wr941nd-v6-cn
> +TARGET_DEVICES += tl-wr941nd-v5 tl-wr941nd-v6 tl-wr941nd-v6-cn
>  
>  define Device/tl-wr1041n-v2
>      $(Device/tplink-4mlzma)
> diff --git
> a/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch
> b/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch index
> 8ee0d3f..da594a5 100644 ---
> a/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch +++
> b/target/linux/ar71xx/patches-4.1/700-MIPS-ath79-openwrt-machines.patch @@
> -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++
> b/arch/mips/ath79/machtypes.h -@@ -16,24 +16,210 @@
> +@@ -16,24 +16,211 @@
>   
>   enum ath79_mach_type {
>       ATH79_MACH_GENERIC = 0,
> @@ -158,6 +158,7 @@
>  +    ATH79_MACH_TL_WR842N_V2,        /* TP-LINK TL-WR842N/ND v2 */
>  +    ATH79_MACH_TL_WR941ND,          /* TP-LINK TL-WR941ND */
>  +    ATH79_MACH_TL_WR941ND_V5,       /* TP-LINK TL-WR941ND v5 */
> ++    ATH79_MACH_TL_WR941ND_V6,       /* TP-LINK TL-WR941ND v6 */
>  +    ATH79_MACH_TUBE2H,              /* Alfa Network Tube2H */
>  +    ATH79_MACH_UBNT_AIRGW,          /* Ubiquiti AirGateway */
>  +    ATH79_MACH_UBNT_AIRGWP,         /* Ubiquiti AirGateway Pro */
> @@ -304,7 +305,7 @@
>   config ATH79_MACH_AP121
>       bool "Atheros AP121 reference board"
>       select SOC_AR933X
> -@@ -11,62 +95,1107 @@ config ATH79_MACH_AP121
> +@@ -11,62 +95,1116 @@ config ATH79_MACH_AP121
>       select ATH79_DEV_M25P80
>       select ATH79_DEV_USB
>       select ATH79_DEV_WMAC
> @@ -1185,10 +1186,7 @@
>  +    select ATH79_DEV_M25P80
>  +    select ATH79_DEV_USB
>  +    select ATH79_DEV_WMAC
> - 
> --config ATH79_MACH_AP136
> --    bool "Atheros AP136/AP135 reference board"
> --    select SOC_QCA955X
> ++
>  +config ATH79_MACH_TL_WA7210N_V2
>  +       bool "TP-LINK TL-WA7210N v2 support"
>  +       select SOC_AR724X
> @@ -1203,19 +1201,12 @@
>  +    bool "TP-LINK TL-WA830RE v2 support"
>  +    select SOC_AR934X
>  +    select ATH79_DEV_ETH
> -     select ATH79_DEV_GPIO_BUTTONS
> -     select ATH79_DEV_LEDS_GPIO
> --    select ATH79_DEV_NFC
> --    select ATH79_DEV_SPI
> ++    select ATH79_DEV_GPIO_BUTTONS
> ++    select ATH79_DEV_LEDS_GPIO
>  +    select ATH79_DEV_M25P80
> -     select ATH79_DEV_USB
> -     select ATH79_DEV_WMAC
> --    help
> --      Say 'Y' here if you want your kernel to support the
> --      Atheros AP136 or AP135 reference boards.
> - 
> --config ATH79_MACH_AP81
> --    bool "Atheros AP81 reference board"
> ++    select ATH79_DEV_USB
> ++    select ATH79_DEV_WMAC
> ++
>  +config ATH79_MACH_TL_WA901ND
>  +    bool "TP-LINK TL-WA901ND/TL-WA7510N support"
>  +    select SOC_AR724X
> @@ -1227,11 +1218,11 @@
>  +
>  +config ATH79_MACH_TL_WA901ND_V2
>  +    bool "TP-LINK TL-WA901ND v2 support"
> -     select SOC_AR913X
> -     select ATH79_DEV_ETH
> -     select ATH79_DEV_GPIO_BUTTONS
> -     select ATH79_DEV_LEDS_GPIO
> -     select ATH79_DEV_M25P80
> ++    select SOC_AR913X
> ++    select ATH79_DEV_ETH
> ++    select ATH79_DEV_GPIO_BUTTONS
> ++    select ATH79_DEV_LEDS_GPIO
> ++    select ATH79_DEV_M25P80
>  +    select ATH79_DEV_WMAC
>  +
>  +config ATH79_MACH_TL_WDR3500
> @@ -1242,34 +1233,13 @@
>  +    select ATH79_DEV_GPIO_BUTTONS
>  +    select ATH79_DEV_LEDS_GPIO
>  +    select ATH79_DEV_M25P80
> -     select ATH79_DEV_USB
> -     select ATH79_DEV_WMAC
> --    help
> --      Say 'Y' here if you want your kernel to support the
> --      Atheros AP81 reference board.
> - 
> --config ATH79_MACH_DB120
> --    bool "Atheros DB120 reference board"
> ++    select ATH79_DEV_USB
> ++    select ATH79_DEV_WMAC
> ++
>  +config ATH79_MACH_TL_WDR4300
>  +    bool "TP-LINK TL-WDR3600/4300/4310 board support"
> -     select SOC_AR934X
> -     select ATH79_DEV_AP9X_PCI if PCI
> -     select ATH79_DEV_ETH
> -     select ATH79_DEV_GPIO_BUTTONS
> -     select ATH79_DEV_LEDS_GPIO
> -     select ATH79_DEV_M25P80
> --    select ATH79_DEV_NFC
> -     select ATH79_DEV_USB
> -     select ATH79_DEV_WMAC
> --    help
> --      Say 'Y' here if you want your kernel to support the
> --      Atheros DB120 reference board.
> - 
> --config ATH79_MACH_PB44
> --    bool "Atheros PB44 reference board"
> -+config ATH79_MACH_TL_WR703N
> -+    bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
> -+    select SOC_AR933X
> ++    select SOC_AR934X
> ++    select ATH79_DEV_AP9X_PCI if PCI
>  +    select ATH79_DEV_ETH
>  +    select ATH79_DEV_GPIO_BUTTONS
>  +    select ATH79_DEV_LEDS_GPIO
> @@ -1277,8 +1247,8 @@
>  +    select ATH79_DEV_USB
>  +    select ATH79_DEV_WMAC
>  +
> -+config ATH79_MACH_TL_WR720N_V3
> -+    bool "TP-LINK TL-WR720N v3/v4 support"
> ++config ATH79_MACH_TL_WR703N
> ++    bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
>  +    select SOC_AR933X
>  +    select ATH79_DEV_ETH
>  +    select ATH79_DEV_GPIO_BUTTONS
> @@ -1286,7 +1256,28 @@
>  +    select ATH79_DEV_M25P80
>  +    select ATH79_DEV_USB
>  +    select ATH79_DEV_WMAC
> -+
> + 
> +-config ATH79_MACH_AP136
> +-    bool "Atheros AP136/AP135 reference board"
> +-    select SOC_QCA955X
> ++config ATH79_MACH_TL_WR720N_V3
> ++    bool "TP-LINK TL-WR720N v3/v4 support"
> ++    select SOC_AR933X
> ++    select ATH79_DEV_ETH
> +     select ATH79_DEV_GPIO_BUTTONS
> +     select ATH79_DEV_LEDS_GPIO
> +-    select ATH79_DEV_NFC
> +-    select ATH79_DEV_SPI
> ++    select ATH79_DEV_M25P80
> +     select ATH79_DEV_USB
> +     select ATH79_DEV_WMAC
> +-    help
> +-      Say 'Y' here if you want your kernel to support the
> +-      Atheros AP136 or AP135 reference boards.
> + 
> +-config ATH79_MACH_AP81
> +-    bool "Atheros AP81 reference board"
> +-    select SOC_AR913X
>  +config ATH79_MACH_TL_WR741ND
>  +    bool "TP-LINK TL-WR741ND support"
>  +    select SOC_AR724X
> @@ -1299,21 +1290,25 @@
>  +config ATH79_MACH_TL_WR741ND_V4
>  +    bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support"
>  +    select SOC_AR933X
> -+    select ATH79_DEV_ETH
> -+    select ATH79_DEV_GPIO_BUTTONS
> -+    select ATH79_DEV_LEDS_GPIO
> -+    select ATH79_DEV_M25P80
> -+    select ATH79_DEV_USB
> -+    select ATH79_DEV_WMAC
> -+
> -+config ATH79_MACH_TL_WR841N_V1
> -+    bool "TP-LINK TL-WR841N v1 support"
> -     select SOC_AR71XX
> -+    select ATH79_DEV_DSA
>       select ATH79_DEV_ETH
>       select ATH79_DEV_GPIO_BUTTONS
>       select ATH79_DEV_LEDS_GPIO
> --    select ATH79_DEV_SPI
> +     select ATH79_DEV_M25P80
> +     select ATH79_DEV_USB
> +     select ATH79_DEV_WMAC
> +-    help
> +-      Say 'Y' here if you want your kernel to support the
> +-      Atheros AP81 reference board.
> + 
> +-config ATH79_MACH_DB120
> +-    bool "Atheros DB120 reference board"
> ++config ATH79_MACH_TL_WR841N_V1
> ++    bool "TP-LINK TL-WR841N v1 support"
> ++    select SOC_AR71XX
> ++    select ATH79_DEV_DSA
> ++    select ATH79_DEV_ETH
> ++    select ATH79_DEV_GPIO_BUTTONS
> ++    select ATH79_DEV_LEDS_GPIO
>  +    select ATH79_DEV_M25P80
>  +
>  +config ATH79_MACH_TL_WR841N_V8
> @@ -1345,17 +1340,32 @@
>  +    select ATH79_DEV_M25P80
>  +    select ATH79_DEV_WMAC
>  +
> -+config ATH79_MACH_TL_WR1041N_V2
> -+    bool "TP-LINK TL-WR1041N v2 support"
> -+    select SOC_AR934X
> -+    select ATH79_DEV_AP9X_PCI if PCI
> ++config ATH79_MACH_TL_WR941ND_V6
> ++    bool "TP-LINK TL-WR941ND v6 support"
> ++    select SOC_QCA956X
>  +    select ATH79_DEV_ETH
>  +    select ATH79_DEV_GPIO_BUTTONS
>  +    select ATH79_DEV_LEDS_GPIO
>  +    select ATH79_DEV_M25P80
> -+    select ATH79_DEV_USB
>  +    select ATH79_DEV_WMAC
>  +
> ++config ATH79_MACH_TL_WR1041N_V2
> ++    bool "TP-LINK TL-WR1041N v2 support"
> +     select SOC_AR934X
> +     select ATH79_DEV_AP9X_PCI if PCI
> +     select ATH79_DEV_ETH
> +     select ATH79_DEV_GPIO_BUTTONS
> +     select ATH79_DEV_LEDS_GPIO
> +     select ATH79_DEV_M25P80
> +-    select ATH79_DEV_NFC
> +     select ATH79_DEV_USB
> +     select ATH79_DEV_WMAC
> +-    help
> +-      Say 'Y' here if you want your kernel to support the
> +-      Atheros DB120 reference board.
> + 
> +-config ATH79_MACH_PB44
> +-    bool "Atheros PB44 reference board"
>  +config ATH79_MACH_TL_WR1043ND
>  +    bool "TP-LINK TL-WR1043ND support"
>  +    select SOC_AR913X
> @@ -1398,11 +1408,12 @@
>  +
>  +config ATH79_MACH_TEW_673GRU
>  +    bool "TRENDnet TEW-673GRU support"
> -+    select SOC_AR71XX
> +     select SOC_AR71XX
>  +    select ATH79_DEV_AP9X_PCI if PCI
> -+    select ATH79_DEV_ETH
> -+    select ATH79_DEV_GPIO_BUTTONS
> -+    select ATH79_DEV_LEDS_GPIO
> +     select ATH79_DEV_ETH
> +     select ATH79_DEV_GPIO_BUTTONS
> +     select ATH79_DEV_LEDS_GPIO
> +-    select ATH79_DEV_SPI
>  +    select ATH79_DEV_M25P80
>  +    select ATH79_DEV_USB
>  +    select ATH79_NVRAM
> @@ -1440,7 +1451,7 @@
>   
>   config ATH79_MACH_UBNT_XM
>       bool "Ubiquiti Networks XM/UniFi boards"
> -@@ -83,6 +1212,116 @@ config ATH79_MACH_UBNT_XM
> +@@ -83,6 +1221,116 @@ config ATH79_MACH_UBNT_XM
>         Say 'Y' here if you want your kernel to support the
>         Ubiquiti Networks XM (rev 1.0) board.
>   
> @@ -1557,7 +1568,7 @@
>   endmenu
>   
>   config SOC_AR71XX
> -@@ -134,7 +1373,10 @@ config ATH79_DEV_DSA
> +@@ -134,7 +1382,10 @@ config ATH79_DEV_DSA
>   config ATH79_DEV_ETH
>       def_bool n
>   
> @@ -1569,7 +1580,7 @@
>       def_bool n
>   
>   config ATH79_DEV_GPIO_BUTTONS
> -@@ -164,6 +1406,11 @@ config ATH79_PCI_ATH9K_FIXUP
> +@@ -164,6 +1415,11 @@ config ATH79_PCI_ATH9K_FIXUP
>       def_bool n
>   
>   config ATH79_ROUTERBOOT
> @@ -1583,7 +1594,7 @@
>   endif
>  --- a/arch/mips/ath79/Makefile
>  +++ b/arch/mips/ath79/Makefile
> -@@ -38,9 +38,135 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)           += route
> +@@ -38,9 +38,136 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)           += route
>   #
>   # Machines
>   #
> @@ -1684,6 +1695,7 @@
>  +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V8)       += mach-tl-wr841n-v8.o
>  +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9)       += mach-tl-wr841n-v9.o
>  +obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o
> ++obj-$(CONFIG_ATH79_MACH_TL_WR941ND_V6)      += mach-tl-wr941nd-v6.o
>  +obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2)      += mach-tl-wr1041n-v2.o
>  +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND)        += mach-tl-wr1043nd.o
>  +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2)     += mach-tl-wr1043nd-v2.o
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to