From: RISCi_ATOM Date: Wed, 14 Oct 2015 19:12:20 +0000 (+0000) Subject: Removed luci binaries that made it in the tree, added iwinfo Makefile and added new... X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ee14310410989741aa0fd3c10362e7d3fc53192;p=librecmc%2Flibrecmc-fossil.git Removed luci binaries that made it in the tree, added iwinfo Makefile and added new board support. --- diff --git a/trunk/package/luci/modules/luci-base/src/po2lmo b/trunk/package/luci/modules/luci-base/src/po2lmo deleted file mode 100755 index 611ff797..00000000 Binary files a/trunk/package/luci/modules/luci-base/src/po2lmo and /dev/null differ diff --git a/trunk/package/luci/modules/luci-base/src/po2lmo.o b/trunk/package/luci/modules/luci-base/src/po2lmo.o deleted file mode 100644 index fc2b50c8..00000000 Binary files a/trunk/package/luci/modules/luci-base/src/po2lmo.o and /dev/null differ diff --git a/trunk/package/luci/modules/luci-base/src/template_lmo.o b/trunk/package/luci/modules/luci-base/src/template_lmo.o deleted file mode 100644 index 1b2f5587..00000000 Binary files a/trunk/package/luci/modules/luci-base/src/template_lmo.o and /dev/null differ diff --git a/trunk/package/network/utils/iwinfo/Makefile b/trunk/package/network/utils/iwinfo/Makefile new file mode 100644 index 00000000..9d7e321c --- /dev/null +++ b/trunk/package/network/utils/iwinfo/Makefile @@ -0,0 +1,121 @@ +# +# Copyright (C) 2010-2015 Jo-Philipp Wich +# +# This is free software, licensed under the GPL 2 license. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libiwinfo +PKG_VERSION:=2015-06-01 +PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=http://git.openwrt.org/project/iwinfo.git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=ade8b1b299cbd5748db1acf80dd3e9f567938371 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_MAINTAINER:=Jo-Philipp Wich +PKG_LICENSE:=GPL-2.0 + +PKG_CONFIG_DEPENDS := \ + CONFIG_PACKAGE_kmod-brcm-wl \ + CONFIG_PACKAGE_kmod-brcm-wl-mini \ + CONFIG_PACKAGE_kmod-brcm-wl-mimo \ + CONFIG_PACKAGE_kmod-madwifi \ + CONFIG_PACKAGE_kmod-cfg80211 + +include $(INCLUDE_DIR)/package.mk + + +define Package/libiwinfo + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Generalized Wireless Information Library (iwinfo) + DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny +libuci + ABI_VERSION:=$(PKG_RELEASE) +endef + +define Package/libiwinfo/description + Wireless information library with consistent interface for proprietary Broadcom, + madwifi, nl80211 and wext driver interfaces. +endef + + +define Package/libiwinfo-lua + SUBMENU:=Lua + SECTION:=lang + CATEGORY:=Languages + TITLE:=libiwinfo Lua binding + DEPENDS:=+libiwinfo +liblua +endef + +define Package/libiwinfo-lua/description + This is the Lua binding for the iwinfo library. It provides access to all enabled + backends. +endef + + +define Package/iwinfo + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Generalized Wireless Information utility + DEPENDS:=+libiwinfo +endef + +define Package/iwinfo/description + Command line frontend for the wireless information library. +endef + + +define Build/Configure +endef + +IWINFO_BACKENDS := \ + $(if $(CONFIG_PACKAGE_kmod-brcm-wl),wl) \ + $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mini),wl) \ + $(if $(CONFIG_PACKAGE_kmod-brcm-wl-mimo),wl) \ + $(if $(CONFIG_PACKAGE_kmod-madwifi),madwifi) \ + $(if $(CONFIG_PACKAGE_kmod-cfg80211),nl80211) + +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/usr/include/libnl-tiny \ + -I$(STAGING_DIR)/usr/include \ + -D_GNU_SOURCE + +MAKE_FLAGS += \ + FPIC="$(FPIC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + BACKENDS="$(IWINFO_BACKENDS)" + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/iwinfo + $(CP) $(PKG_BUILD_DIR)/include/iwinfo.h $(1)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/iwinfo/* $(1)/usr/include/iwinfo/ + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so + $(INSTALL_DIR) $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so +endef + +define Package/libiwinfo/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiwinfo.so $(1)/usr/lib/libiwinfo.so + $(INSTALL_DIR) $(1)/usr/share/libiwinfo + $(INSTALL_DATA) $(PKG_BUILD_DIR)/hardware.txt $(1)/usr/share/libiwinfo/hardware.txt +endef + +define Package/libiwinfo-lua/install + $(INSTALL_DIR) $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/lib/lua/iwinfo.so +endef + +define Package/iwinfo/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo $(1)/usr/bin/iwinfo +endef + +$(eval $(call BuildPackage,libiwinfo)) +$(eval $(call BuildPackage,libiwinfo-lua)) +$(eval $(call BuildPackage,iwinfo)) diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index d628f1ab..e6c24456 100644 --- a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -497,6 +497,14 @@ tl-wr2543n) ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1" ;; +tpe-r1100) + ucidef_set_led_wlan "wlan" "WLAN" "gl_ar150:wlan" "phy0tpt" + ;; + +tpe-r3300) + ucidef_set_led_wlan "wlan" "WLAN" "gl_ar300:wlan" "phy0tpt" + ;; + tube2h) ucidef_set_led_netdev "lan" "LAN" "alfa:blue:lan" "eth0" ucidef_set_rssimon "wlan0" "40000" "1" diff --git a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 7e268865..ec5edef2 100644 --- a/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -358,6 +358,13 @@ tl-wa901nd |\ tl-wa901nd-v2 |\ tl-wa901nd-v3 |\ tl-wr703n |\ +tpe-r1100 |\ +tpe-r3300) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ucidef_add_switch "switch0" "1" "1" + ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4" + ;; + tube2h |\ wndap360 |\ mynet-rext |\ diff --git a/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh index cacf3628..3bbf20c9 100755 --- a/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -805,6 +805,9 @@ ar71xx_board_detect() { *"TL-MR13U v1") name="tl-mr13u" ;; + *"TPE-R3300") + name="tpe-r3300" + ;; *"Tube2H") name="tube2h" ;; diff --git a/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index e5376ef8..aa158bda 100755 --- a/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -381,7 +381,8 @@ platform_check_image() { return 0 ;; - + tpe-r3300 | \ + tpe-r1100 | \ tube2h) alfa_check_image "$1" && return 0 return 1 diff --git a/trunk/target/linux/ar71xx/config-3.18 b/trunk/target/linux/ar71xx/config-3.18 index d661aa74..f0456ba5 100644 --- a/trunk/target/linux/ar71xx/config-3.18 +++ b/trunk/target/linux/ar71xx/config-3.18 @@ -130,6 +130,8 @@ 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_TPE_R1100=y +CONFIG_ATH79_MACH_TPE_R3300=y CONFIG_ATH79_MACH_TUBE2H=y CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_XM=y diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c new file mode 100644 index 00000000..f437a843 --- /dev/null +++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r1100.c @@ -0,0 +1,123 @@ +/* + * TPE-R1100 board support + * + * Copyright (C) 2011 dongyuqi <729650915@qq.com> + * Copyright (C) 2011-2012 Gabor Juhos + * Copyright (C) 2013 alzhao + * Copyright (C) 2014 Michel Stempin + * Copyright (C) 2015 Robert Call + * + * 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 + +#include + +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define TPE_R1100_GPIO_LED_WLAN 0 +#define TPE_R1100_GPIO_LED_LAN 13 +#define TPE_R1100_GPIO_LED_WAN 15 + +#define TPE_R1100_GPIO_BIN_USB 6 +#define TPE_R1100_GPIO_BTN_MANUAL 7 +#define TPE_R1100_GPIO_BTN_AUTO 8 +#define TPE_R1100_GPIO_BTN_RESET 11 + +#define TPE_R1100_KEYS_POLL_INTERVAL 20 /* msecs */ +#define TPE_R1100_KEYS_DEBOUNCE_INTERVAL (3 * TPE_R1100_KEYS_POLL_INTERVAL) + +#define TPE_R1100_MAC0_OFFSET 0x0000 +#define TPE_R1100_MAC1_OFFSET 0x0000 +#define TPE_R1100_CALDATA_OFFSET 0x1000 +#define TPE_R1100_WMAC_MAC_OFFSET 0x0000 + +static struct gpio_led tpe_r1100_leds_gpio[] __initdata = { + { + .name = "tpe_r1100:wlan", + .gpio = TPE_R1100_GPIO_LED_WLAN, + .active_low = 0, + }, + { + .name = "tpe_r1100:lan", + .gpio = TPE_R1100_GPIO_LED_LAN, + .active_low = 0, + }, + { + .name = "tpe_r1100:wan", + .gpio = TPE_R1100_GPIO_LED_WAN, + .active_low = 0, + .default_state = 1, + }, +}; + +static struct gpio_keys_button tpe_r1100_gpio_keys[] __initdata = { + { + .desc = "BTN_7", + .type = EV_KEY, + .code = BTN_7, + .debounce_interval = TPE_R1100_KEYS_DEBOUNCE_INTERVAL, + .gpio = TPE_R1100_GPIO_BTN_MANUAL, + .active_low = 0, + }, + { + .desc = "BTN_8", + .type = EV_KEY, + .code = BTN_8, + .debounce_interval = TPE_R1100_KEYS_DEBOUNCE_INTERVAL, + .gpio = TPE_R1100_GPIO_BTN_AUTO, + .active_low = 0, + }, + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TPE_R1100_KEYS_DEBOUNCE_INTERVAL, + .gpio = TPE_R1100_GPIO_BTN_RESET, + .active_low = 0, + }, +}; + +static void __init tpe_r1100_setup(void) +{ + + /* ART base address */ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ + ath79_setup_ar933x_phy4_switch(false, false); + + /* register flash. */ + ath79_register_m25p80(NULL); + + /* register gpio LEDs and keys */ + ath79_register_leds_gpio(-1, ARRAY_SIZE(tpe_r1100_leds_gpio), + tpe_r1100_leds_gpio); + ath79_register_gpio_keys_polled(-1, TPE_R1100_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tpe_r1100_gpio_keys), + tpe_r1100_gpio_keys); + + /* enable usb */ + ath79_register_usb(); + + /* register eth0 as WAN, eth1 as LAN */ + ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R1100_MAC0_OFFSET, 0); + ath79_init_mac(ath79_eth1_data.mac_addr, art+TPE_R1100_MAC1_OFFSET, 0); + ath79_register_mdio(0, 0x0); + ath79_register_eth(0); + ath79_register_eth(1); + + /* register wireless mac with cal data */ + ath79_register_wmac(art + TPE_R1100_CALDATA_OFFSET, art + TPE_R1100_WMAC_MAC_OFFSET); +} + +MIPS_MACHINE(ATH79_MACH_TPE_R1100, "TPE_R1100", "tpe_r1100 board",tpe_r1100_setup); diff --git a/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c new file mode 100644 index 00000000..3d3922a0 --- /dev/null +++ b/trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-tpe-r3300.c @@ -0,0 +1,111 @@ +/* + * TPE-R3300 board support + * + * Copyright (C) 2011 dongyuqi <729650915@qq.com> + * Copyright (C) 2011-2012 Gabor Juhos + * Copyright (C) 2013 alzhao + * Copyright (C) 2014 Michel Stempin + * Copyright (C) 2015 Robert Call + * + * 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 +#include +#include +#include +#include +#include + +#include +#include + +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define TPE_R3300_GPIO_LED_WLAN 13 +#define TPE_R3300_GPIO_LED_WAN 14 +#define TPE_R3300_GPIO_BTN_RESET 16 + + +#define TPE_R3300_KEYS_POLL_INTERVAL 20 /* msecs */ +#define TPE_R3300_KEYS_DEBOUNCE_INTERVAL (3 * TPE_R3300_KEYS_POLL_INTERVAL) + +#define TPE_R3300_MAC0_OFFSET 0x0000 +#define TPE_R3300_MAC1_OFFSET 0x0000 +#define TPE_R3300_CALDATA_OFFSET 0x1000 +#define TPE_R3300_WMAC_MAC_OFFSET 0x0000 + +static struct gpio_led tpe_r3300_leds_gpio[] __initdata = { + { + .name = "tpe_r3300:wlan", + .gpio = TPE_R3300_GPIO_LED_WLAN, + .active_low = 1, + }, + { + .name = "tpe_r3300:wan", + .gpio = TPE_R3300_GPIO_LED_WAN, + .active_low = 1, + }, +}; + +static struct gpio_keys_button tpe_r3300_gpio_keys[] __initdata = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = TPE_R3300_KEYS_DEBOUNCE_INTERVAL, + .gpio = TPE_R3300_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static void __init tpe_r3300_setup(void) +{ + + /* ART base address */ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + + /* disable PHY_SWAP and PHY_ADDR_SWAP bits */ + //ath79_setup_ar933x_phy4_switch(false, false); + + /* register flash. */ + ath79_register_m25p80(NULL); + + /* register gpio LEDs and keys */ + ath79_register_leds_gpio(-1, ARRAY_SIZE(tpe_r3300_leds_gpio), + tpe_r3300_leds_gpio); + ath79_register_gpio_keys_polled(-1, TPE_R3300_KEYS_POLL_INTERVAL, + ARRAY_SIZE(tpe_r3300_gpio_keys), + tpe_r3300_gpio_keys); + + /* enable usb */ + ath79_register_usb(); + ath79_register_mdio(1, 0x0); + + /* register eth0 as WAN, eth1 as LAN */ + ath79_init_mac(ath79_eth0_data.mac_addr, art+TPE_R3300_MAC0_OFFSET, 0); + ath79_switch_data.phy4_mii_en = 1; + ath79_switch_data.phy_poll_mask = BIT(4); + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII; + ath79_eth0_data.phy_mask = BIT(4); + ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev; + + ath79_register_eth(0); + + ath79_init_mac(ath79_eth1_data.mac_addr, art+TPE_R3300_MAC1_OFFSET, 0); + ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII; + ath79_register_eth(1); + + /* register wireless mac with cal data */ + ath79_register_wmac(art + TPE_R3300_CALDATA_OFFSET, art + TPE_R3300_WMAC_MAC_OFFSET); +} + +MIPS_MACHINE(ATH79_MACH_TPE_R3300, "TPE-R3300", "TPE-R3300", tpe_r3300_setup); diff --git a/trunk/target/linux/ar71xx/generic/profiles/thinkpenguin.mk b/trunk/target/linux/ar71xx/generic/profiles/thinkpenguin.mk new file mode 100644 index 00000000..b8ab4a18 --- /dev/null +++ b/trunk/target/linux/ar71xx/generic/profiles/thinkpenguin.mk @@ -0,0 +1,27 @@ +# +# Copyright (C) 2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +define Profile/TPE-R1100 + NAME:=TPE-R1100 + PACKAGES:=kmod-usb-core kmod-usb2 +endef + +define Profile/TPE-R1100/Description + Configuration for the ThinkPenguin mini Wireless N router.. +endef + +$(eval $(call Profile,TPE-R1100)) + +define Profile/TPE-R3300 + NAME:=TPE-R3300 + PACKAGES:=kmod-usb-core kmod-usb2 +endef + +define Profile/TPE-R3300/Description + Configuration for the ThinkPenguin Wireless N pro router.. +endef + +$(eval $(call Profile,TPE-R3300)) diff --git a/trunk/target/linux/ar71xx/image/Makefile b/trunk/target/linux/ar71xx/image/Makefile index a61a5f77..65dec367 100644 --- a/trunk/target/linux/ar71xx/image/Makefile +++ b/trunk/target/linux/ar71xx/image/Makefile @@ -661,6 +661,23 @@ define Device/oolite endef TARGET_DEVICES += oolite +define Device/tpe-r1100 + BOARDNAME = TPE-R1100 + IMAGE_SIZE = 16000k + CONSOLE = ttyATH0,115200 + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro +endef +TARGET_DEVICES += tpe-r1100 + +define Device/tpe-r3300 + BOARDNAME = TPE-R3300 + IMAGE_SIZE = 16000k + CONSOLE = ttyATH0,115200 + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro +endef +TARGET_DEVICES += tpe-r3300 + + rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) # $(1): rootfs type. diff --git a/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk b/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk new file mode 100644 index 00000000..bb7099bd --- /dev/null +++ b/trunk/target/linux/ar71xx/luci/profiles/thinkpenguin.mk @@ -0,0 +1,29 @@ +# +# Copyright (C) 2013 OpenWrt.org +# Copyright (C) 2015 libreCMC.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/TPE-R1100 + NAME:=TPE-R1100 + PACKAGES:=luci luci-ssl kmod-usb-core kmod-usb2 +endef + +define Profile/TPE-R1100/Description + Configuration for the ThinkPenguin mini Wireless N router.. +endef + +$(eval $(call Profile,TPE-R1100)) + +define Profile/TPE-R3300 + NAME:=TPE-R3300 + PACKAGES:=luci luci-ssl kmod-usb-core kmod-usb2 +endef + +define Profile/TPE-R3300/Description + Configuration for the ThinkPenguin Wireless N pro router.. +endef + +$(eval $(call Profile,TPE-R3300)) diff --git a/trunk/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-tpe-r1100.patch b/trunk/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-tpe-r1100.patch new file mode 100644 index 00000000..bbcb0405 --- /dev/null +++ b/trunk/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-tpe-r1100.patch @@ -0,0 +1,39 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -522,6 +522,16 @@ config ATH79_MACH_GL_INET + select ATH79_DEV_USB + select ATH79_DEV_WMAC + ++config ATH79_MACH_TPE_R1100 ++ bool "TPE-R1100 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_EAP300V2 + bool "EnGenius EAP300 v2 support" + select SOC_AR934X +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -78,6 +78,7 @@ obj-$(CONFIG_ATH79_MACH_EPG5000) += mach + obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o + obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o + obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o ++obj-$(CONFIG_ATH79_MACH_TPE_R1100) += mach-tpe-r1100.o + obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o + obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361) += mach-hiwifi-hc6361.o + obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -67,6 +67,7 @@ enum ath79_mach_type { + ATH79_MACH_EPG5000, /* EnGenius EPG5000 */ + ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ + ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ ++ ATH79_MACH_TPE_R1100, /* TPE-R1100 support */ + ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */ + ATH79_MACH_HIWIFI_HC6361, /* HiWiFi HC6361 */ + ATH79_MACH_JA76PF, /* jjPlus JA76PF */ diff --git a/trunk/target/linux/ar71xx/patches-3.18/912-MIPS-ath79-add-tpe-r3300.patch b/trunk/target/linux/ar71xx/patches-3.18/912-MIPS-ath79-add-tpe-r3300.patch new file mode 100644 index 00000000..b1989eff --- /dev/null +++ b/trunk/target/linux/ar71xx/patches-3.18/912-MIPS-ath79-add-tpe-r3300.patch @@ -0,0 +1,39 @@ +--- a/arch/mips/ath79/Kconfig ++++ b/arch/mips/ath79/Kconfig +@@ -532,6 +532,16 @@ config ATH79_MACH_TPE_R1100 + select ATH79_DEV_USB + select ATH79_DEV_WMAC + ++config ATH79_MACH_TPE_R3300 ++ bool "TPE_R3300 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_EAP300V2 + bool "EnGenius EAP300 v2 support" + select SOC_AR934X +--- a/arch/mips/ath79/Makefile ++++ b/arch/mips/ath79/Makefile +@@ -79,6 +79,7 @@ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach + obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o + obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o + obj-$(CONFIG_ATH79_MACH_TPE_R1100) += mach-tpe-r1100.o ++obj-$(CONFIG_ATH79_MACH_TPE_R3300) += mach-tpe-r3300.o + obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o + obj-$(CONFIG_ATH79_MACH_HIWIFI_HC6361) += mach-hiwifi-hc6361.o + obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o +--- a/arch/mips/ath79/machtypes.h ++++ b/arch/mips/ath79/machtypes.h +@@ -68,6 +68,7 @@ enum ath79_mach_type { + ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ + ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */ + ATH79_MACH_TPE_R1100, /* TPE-R1100 support */ ++ ATH79_MACH_TPE_R3300, /* TPE-R3300 */ + ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */ + ATH79_MACH_HIWIFI_HC6361, /* HiWiFi HC6361 */ + ATH79_MACH_JA76PF, /* jjPlus JA76PF */