Sorry for the HTML mail, trying to send as plain text Added Proper Hardware Support for Ubiquity AirRouter. No more MAC address duplication. Fixed issues from: http://patchwork.midlink.org/patch/1284/ -WAN and LAN Port inverted *fixed* -LEDs not correct *fixed, 1 user LED 'globe' working, no more inverted operation*
Signed-off-by: Gergely Barta <gergely.ba...@printerfairkft.hu> --- Index: target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h =================================================================== --- target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (revision 29273) +++ target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h (working copy) @@ -58,6 +58,7 @@ AR71XX_MACH_TL_WR841N_V1, /* TP-LINK TL-WR841N v1 */ AR71XX_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */ AR71XX_MACH_UBNT_BULLET_M, /* Ubiquiti Bullet M */ + AR71XX_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */ AR71XX_MACH_UBNT_LSSR71, /* Ubiquiti LS-SR71 */ AR71XX_MACH_UBNT_LSX, /* Ubiquiti LSX */ AR71XX_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */ Index: target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c =================================================================== --- target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (revision 29273) +++ target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c (working copy) @@ -283,6 +283,39 @@ MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M", ubnt_nano_m_setup); +/* Ubiquity AirRouter */ +static struct gpio_led ubnt_airrouter_leds_gpio[] __initdata = { +{ + .name = "ubnt:globe", + .gpio = 0, + .active_low = 1, + } +}; + +static void __init ubnt_airrouter_setup(void) +{ + u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000); + u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000); + + ar71xx_add_device_m25p80(NULL); + ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK); + + ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0); + ubnt_init_secondary_mac(mac1); + + ar71xx_add_device_eth(0); + ar71xx_add_device_eth(1); + ar71xx_add_device_usb(); + + ap91_pci_init(ee, NULL); + ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ubnt_airrouter_leds_gpio), + ubnt_airrouter_leds_gpio); + +} + +MIPS_MACHINE(AR71XX_MACH_UBNT_AIRROUTER, "UBNT-AR", "Ubiquiti AirRouter", + ubnt_airrouter_setup); + static struct gpio_led ubnt_unifi_leds_gpio[] __initdata = { { .name = "ubnt:orange:dome", Index: target/linux/ar71xx/image/Makefile =================================================================== --- target/linux/ar71xx/image/Makefile (revision 29273) +++ target/linux/ar71xx/image/Makefile (working copy) @@ -563,6 +563,11 @@ $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,UBNTXM,ar7240) endef +ubntairrouter_cmdline=board=UBNT-AR console=ttyS0,115200 +define Image/Build/Profile/UBNTAIRROUTER + $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-airrouter,$(ubntairrouter_cmdline),XM,UBNTXM,ar7240) +endef + ubntunifi_cmdline=board=UBNT-XM console=ttyS0,115200 define Image/Build/Profile/UBNTUNIFI $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240) @@ -575,6 +580,7 @@ $(call Image/Build/Profile/UBNTBULLETM,$(1)) $(call Image/Build/Profile/UBNTROCKETM,$(1)) $(call Image/Build/Profile/UBNTNANOM,$(1)) + $(call Image/Build/Profile/UBNTAIRROUTER,$(1)) $(call Image/Build/Profile/UBNTUNIFI,$(1)) endef Index: target/linux/ar71xx/base-files/lib/ar71xx.sh =================================================================== --- target/linux/ar71xx/base-files/lib/ar71xx.sh (revision 29273) +++ target/linux/ar71xx/base-files/lib/ar71xx.sh (working copy) @@ -115,6 +115,9 @@ *"RouterStation Pro") name="routerstation-pro" ;; + *"AirRouter") + name="airrouter" + ;; *TEW-632BRP) name="tew-632brp" ;; Index: target/linux/ar71xx/base-files/etc/defconfig/airrouter/network =================================================================== --- target/linux/ar71xx/base-files/etc/defconfig/airrouter/network (revision 0) +++ target/linux/ar71xx/base-files/etc/defconfig/airrouter/network (revision 0) @@ -0,0 +1,18 @@ + +config 'interface' 'loopback' + option 'ifname' 'lo' + option 'proto' 'static' + option 'ipaddr' '127.0.0.1' + option 'netmask' '255.0.0.0' + +config 'interface' 'lan' + option 'type' 'bridge' + option 'proto' 'static' + option 'ipaddr' '192.168.1.1' + option 'netmask' '255.255.255.0' + option 'ifname' 'eth1' + +config 'interface' 'wan' + option 'proto' 'dhcp' + option 'ifname' 'eth0' + _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel