Hello,
I've been working on support for this board and I've worked out the kinks.
Since my last patch I've fixed:
* LED GPIO mapping - it only has one controllable LED
* Confirmed the flash layout
* Cleaned up machine file to match recent changes on trunk
* Got rid of the -factory image build
* Extracted the WAN MAC address from the factory configuration partition
* Sorted out my tabs vs. spaces deficiencies
I've only run into one problem which is that if I set a LAN MAC address,
hostapd doesn't work. I'll keep trying to debug the issue, but for now
I've left the LAN MAC to unset so it uses defaults.
I think this is ready to commit.
Signed-off-by: Patrick van Staveren <tr...@vanstaveren.us>
---
base-files/etc/diag.sh | 3
base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 1
base-files/etc/uci-defaults/network | 4 +
base-files/lib/ramips.sh | 3
files/arch/mips/include/asm/mach-ralink/machine.h | 1
files/arch/mips/ralink/rt305x/Kconfig | 5 +
files/arch/mips/ralink/rt305x/Makefile | 1
files/arch/mips/ralink/rt305x/mach-rt-n10-plus.c | 74
+++++++++++++++++++++
image/Makefile | 12 +++
rt305x/config-3.2 | 1
10 files changed, 105 insertions(+)
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
===================================================================
--- target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
(revision 30677)
+++ target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
(working copy)
@@ -26,6 +26,11 @@
bool "Asus RT-G32 revB board support"
select RALINK_DEV_GPIO_BUTTONS
+config RT305X_MACH_RT_N10_PLUS
+ bool "Asus RT-N10+ board support"
+ select RALINK_DEV_GPIO_BUTTONS
+ select RALINK_DEV_GPIO_LEDS
+
config RT305X_MACH_HW550_3G
bool "Aztech HW550-3G support"
select RALINK_DEV_GPIO_BUTTONS
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
===================================================================
--- target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
(revision 30677)
+++ target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
(working copy)
@@ -25,6 +25,7 @@
obj-$(CONFIG_RT305X_MACH_OMNI_EMB) += mach-omni-emb.o
obj-$(CONFIG_RT305X_MACH_PWH2004) += mach-pwh2004.o
obj-$(CONFIG_RT305X_MACH_RT_G32_REVB) += mach-rt-g32-revb.o
+obj-$(CONFIG_RT305X_MACH_RT_N10_PLUS) += mach-rt-n10-plus.o
obj-$(CONFIG_RT305X_MACH_SL_R7205) += mach-sl-r7205.o
obj-$(CONFIG_RT305X_MACH_V22RW_2X2) += mach-v22rw-2x2.o
obj-$(CONFIG_RT305X_MACH_W502U) += mach-w502u.o
Index: target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-n10-plus.c
===================================================================
---
target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-n10-plus.c
(revision 0)
+++
target/linux/ramips/files/arch/mips/ralink/rt305x/mach-rt-n10-plus.c
(revision 0)
@@ -0,0 +1,74 @@
+/*
+ * ASUS RT-N10+ board support
+ *
+ * Copyright (C) 2009-2012 Gabor Juhos <juh...@openwrt.org>
+ *
+ * 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/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ralink/machine.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
+
+#include "devices.h"
+
+#define RT_N10_PLUS_GPIO_LED_WPS 14
+
+#define RT_N10_PLUS_GPIO_BUTTON_WPS 0 /* active low */
+#define RT_N10_PLUS_GPIO_BUTTON_RESET 10 /* active low */
+
+#define RT_N10_PLUS_KEYS_POLL_INTERVAL 20
+#define RT_N10_PLUS_KEYS_DEBOUNCE_INTERVAL (3 *
RT_N10_PLUS_KEYS_POLL_INTERVAL)
+
+static struct gpio_led rt_n10_plus_leds_gpio[] __initdata = {
+ {
+ .name = "asus:green:wps",
+ .gpio = RT_N10_PLUS_GPIO_LED_WPS,
+ .active_low = 1,
+ }
+};
+
+static struct gpio_keys_button rt_n10_plus_gpio_buttons[] __initdata = {
+ {
+ .desc = "reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = RT_N10_PLUS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = RT_N10_PLUS_GPIO_BUTTON_RESET,
+ .active_low = 1,
+ }, {
+ .desc = "wps",
+ .type = EV_KEY,
+ .code = KEY_WPS_BUTTON,
+ .debounce_interval = RT_N10_PLUS_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = RT_N10_PLUS_GPIO_BUTTON_WPS,
+ .active_low = 1,
+ }
+};
+
+static void __init rt_n10_plus_init(void)
+{
+ rt305x_gpio_init(RT305X_GPIO_MODE_GPIO <<
RT305X_GPIO_MODE_UART0_SHIFT);
+
+ rt305x_register_flash(0);
+
+ rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
+ rt305x_register_ethernet();
+ ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n10_plus_leds_gpio),
+ rt_n10_plus_leds_gpio);
+ ramips_register_gpio_buttons(-1, RT_N10_PLUS_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(rt_n10_plus_gpio_buttons),
+ rt_n10_plus_gpio_buttons);
+ rt305x_register_wifi();
+ rt305x_register_wdt();
+}
+
+MIPS_MACHINE(RAMIPS_MACH_RT_N10_PLUS, "RT-N10-PLUS", "Asus RT-N10+",
+ rt_n10_plus_init);
Index: target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
===================================================================
---
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(revision 30677)
+++
target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h
(working copy)
@@ -26,6 +26,7 @@
RAMIPS_MACH_DIR_600_B1, /* D-Link DIR-600 B1 */
RAMIPS_MACH_DIR_600_B2, /* D-Link DIR-600 B2 */
RAMIPS_MACH_RT_G32_B1, /* Asus RT-G32 B1 */
+ RAMIPS_MACH_RT_N10_PLUS, /* Asus RT-N10+ */
RAMIPS_MACH_NW718, /* Netcore NW718 */
/* RT3052 based machines */
Index: target/linux/ramips/image/Makefile
===================================================================
--- target/linux/ramips/image/Makefile (revision 30677)
+++ target/linux/ramips/image/Makefile (working copy)
@@ -206,10 +206,21 @@
$(call
BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_rtg32b1,$(mtd_rtg32b1_kernel_part_size),$(mtd_rtg32b1_rootfs_part_size))
endef
+mtdlayout_rtn10plus=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(devdata)ro,64k(devconf)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtd_rtn10plus_kernel_part_size=851968
+mtd_rtn10plus_rootfs_part_size=3014656
+define Image/Build/Template/RTN10PLUS
+ $(call
BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_rtn10plus,$(mtd_rtn10plus_kernel_part_size),$(mtd_rtn10plus_rootfs_part_size))
+endef
+
define Image/Build/Profile/RTG32B1
$(call Image/Build/Template/RTG32B1,$(1),rt-g32-b1,RT-G32-B1)
endef
+define Image/Build/Profile/RTN10PLUS
+ $(call
Image/Build/Template/RTN10PLUS,$(1),rt-n10-plus,RT-N10-PLUS,wrg-rt-n10-plus)
+endef
+
define Image/Build/Profile/ESR9753
$(call Image/Build/Template/GENERIC_4M,$(1),esr-9753,ESR-9753)
endef
@@ -325,6 +336,7 @@
$(call Image/Build/Profile/DIR300B1,$(1))
$(call Image/Build/Profile/ESR9753,$(1))
$(call Image/Build/Profile/RTG32B1,$(1))
+ $(call Image/Build/Profile/RTN10PLUS,$(1))
$(call Image/Build/Profile/FONERA20N,$(1))
$(call Image/Build/Profile/V22RW2X2,$(1))
$(call Image/Build/Profile/NBG419N,$(1))
Index: target/linux/ramips/rt305x/config-3.2
===================================================================
--- target/linux/ramips/rt305x/config-3.2 (revision 30677)
+++ target/linux/ramips/rt305x/config-3.2 (working copy)
@@ -106,6 +106,7 @@
CONFIG_RT305X_MACH_OMNI_EMB=y
CONFIG_RT305X_MACH_PWH2004=y
CONFIG_RT305X_MACH_RT_G32_REVB=y
+CONFIG_RT305X_MACH_RT_N10_PLUS=y
CONFIG_RT305X_MACH_SL_R7205=y
CONFIG_RT305X_MACH_V22RW_2X2=y
CONFIG_RT305X_MACH_W502U=y
Index: target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- target/linux/ramips/base-files/lib/ramips.sh (revision 30677)
+++ target/linux/ramips/base-files/lib/ramips.sh (working copy)
@@ -98,6 +98,9 @@
*"RT-G32 B1")
name="rt-g32-b1"
;;
+ *"RT-N10+")
+ name="rt-n10-plus"
+ ;;
*"RT-N15")
name="rt-n15"
;;
Index:
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
===================================================================
---
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom (revision
30677)
+++
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom (working
copy)
@@ -38,6 +38,7 @@
rt2x00_eeprom_extract "devdata" 16384 272
;;
+ rt-n10-plus | \
rt-g32-b1)
rt2x00_eeprom_extract "devconf" 0 272
;;
Index: target/linux/ramips/base-files/etc/uci-defaults/network
===================================================================
--- target/linux/ramips/base-files/etc/uci-defaults/network (revision
30677)
+++ target/linux/ramips/base-files/etc/uci-defaults/network (working
copy)
@@ -106,6 +106,10 @@
wan_mac=$(/usr/sbin/maccalc add "$lan_mac" 1)
;;
+ rt-n10-plus)
+ wan_mac=$(ramips_get_mac_binary devconf 4)
+ ;;
+
dir-300-b1 |\
dir-300-b2 |\
dir-600-b1)
Index: target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- target/linux/ramips/base-files/etc/diag.sh (revision 30677)
+++ target/linux/ramips/base-files/etc/diag.sh (working copy)
@@ -66,6 +66,9 @@
rt-n15)
status_led="rt-n15:blue:power"
;;
+ rt-n10-plus)
+ status_led="asus:green:wps"
+ ;;
rt-n56u)
status_led="asus:blue:power"
;;
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
