From 458632d5ee7b3857fe50ef183cbdaf76a47e717f Mon Sep 17 00:00:00 2001 From: gwrx Date: Sun, 31 May 2020 10:22:50 +0200 Subject: [PATCH] add support for mikrotik ltap-2hnd (Mikrotik LtAP-LTE6) --- ... mt7621_mikrotik_routerboard-ltap2hnd.dts} | 12 +++++-- target/linux/ramips/image/mt7621.mk | 9 ++--- .../mt7621/base-files/etc/board.d/01_leds | 2 +- .../mt7621/base-files/etc/board.d/02_network | 4 +-- .../mt7621/base-files/etc/config/network | 33 +++++++++++++++++++ .../mt7621/base-files/etc/config/wireless | 0 .../etc/uci-defaults/04_led_migration | 4 +-- .../mt7621/base-files/lib/upgrade/platform.sh | 2 +- 8 files changed, 53 insertions(+), 13 deletions(-) rename target/linux/ramips/dts/{mt7621_mikrotik_routerboard-ltap-lte6.dts => mt7621_mikrotik_routerboard-ltap2hnd.dts} (93%) create mode 100644 target/linux/ramips/mt7621/base-files/etc/config/network create mode 100644 target/linux/ramips/mt7621/base-files/etc/config/wireless diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap-lte6.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap2hnd.dts similarity index 93% rename from target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap-lte6.dts rename to target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap2hnd.dts index a58c532386..8ba70eb9a7 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap-lte6.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-ltap2hnd.dts @@ -6,8 +6,8 @@ #include / { - compatible = "mikrotik,routerboard-ltap-lte6", "mediatek,mt7621-soc"; - model = "MikroTik RouterBOARD LTAP LTE6"; + compatible = "mikrotik,routerboard-ltap2hnd", "mediatek,mt7621-soc"; + model = "MikroTik RBLTAP2hND"; aliases { led-boot = &led_usr; @@ -24,7 +24,7 @@ compatible = "gpio-leds"; led_usr: usr { - label = "routerboard-ltap-lte6:green:usr"; + label = "routerboard-ltap2hnd:green:usr"; gpios = <&gpio 0 GPIO_ACTIVE_HIGH>; }; }; @@ -184,4 +184,10 @@ &pcie { status = "okay"; + + wifi@0 { + compatible = "pci168c,0030"; + reg = <0x0000 0 0 0 0>; + + }; }; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index e4398204fd..485e784f2d 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -531,12 +531,13 @@ define Device/mikrotik_routerboard-750gr3 endef TARGET_DEVICES += mikrotik_routerboard-750gr3 -define Device/mikrotik_routerboard-ltap-lte6 +define Device/mikrotik_routerboard-ltap2hnd $(Device/MikroTik) - DEVICE_MODEL := RouterBOARD LTAP LTE6 - SUPPORTED_DEVICES += mikrotik,rbltaplte6 + DEVICE_MODEL := RouterBOARD LTAP2hND + SUPPORTED_DEVICES += mikrotik,rbltap2hnd +DEVICE_PACKAGES := kmod-usb3 kmod-mt76 kmod-cfg80211 wpad-mini iwinfo endef -TARGET_DEVICES += mikrotik_routerboard-ltap-lte6 +TARGET_DEVICES += mikrotik_routerboard-ltap2hnd define Device/mikrotik_routerboard-m11g $(Device/MikroTik) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds index ff14cee98b..0774083e03 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds @@ -41,7 +41,7 @@ linksys,ea7500-v2) ucidef_set_led_netdev "lan4" "lan4 link" "$boardname:green:lan4" "lan4" "link" ucidef_set_led_netdev "wan" "wan link" "$boardname:green:wan" "wan" "link" ;; -mikrotik,routerboard-ltap-lte6|\ +mikrotik,routerboard-ltap2hnd|\ mikrotik,routerboard-m11g) ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan0" "1" "100" diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index c700b0e6ad..ed944b7d32 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -9,7 +9,6 @@ ramips_setup_interfaces() local board="$1" case $board in - mikrotik,routerboard-ltap-lte6|\ asiarf,ap7621-001) ucidef_set_interfaces_lan_wan "lan" "wan" ;; @@ -34,6 +33,7 @@ ramips_setup_interfaces() ucidef_set_interface_lan "lan1 lan2 lan3 lan4" ;; mikrotik,routerboard-m11g|\ + mikrotik,routerboard-ltap2hnd|\ netgear,ex6150|\ thunder,timecloud|\ tplink,re350-v1|\ @@ -100,7 +100,7 @@ ramips_setup_macs() ;; mikrotik,routerboard-750gr3|\ mikrotik,routerboard-m11g|\ - mikrotik,routerboard-ltap-lte6|\ + mikrotik,routerboard-ltap2hnd|\ mikrotik,routerboard-m33g) label_mac=$(cat "/sys/firmware/mikrotik/hard_config/mac_base") wan_mac=$label_mac diff --git a/target/linux/ramips/mt7621/base-files/etc/config/network b/target/linux/ramips/mt7621/base-files/etc/config/network new file mode 100644 index 0000000000..b3d124a2c5 --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/etc/config/network @@ -0,0 +1,33 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config globals 'globals' + option ula_prefix 'fdfd:065f:26b1::/48' + +config interface 'lan' + option type 'bridge' + option ifname 'lan' + option proto 'static' + option ipaddr '192.168.1.9' + option netmask '255.255.255.0' + option ip6assign '60' + +config device 'lan_lan_dev' + option name 'lan' + option macaddr 'c4:ad:34:72:3e:51' + +config interface 'wan' + option ifname 'wan' + option proto 'dhcp' + +config device 'wan_wan_dev' + option name 'wan' + option macaddr 'c4:ad:34:72:3e:50' + +config interface 'wan6' + option ifname 'wan' + option proto 'dhcpv6' + diff --git a/target/linux/ramips/mt7621/base-files/etc/config/wireless b/target/linux/ramips/mt7621/base-files/etc/config/wireless new file mode 100644 index 0000000000..e69de29bb2 diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration index f0bdf2068e..d1ba275cac 100644 --- a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration @@ -9,8 +9,8 @@ boardonly="${board##*,}" case "$board" in mikrotik,routerboard-750gr3) migrate_leds "^rb750gr3:=$boardonly:" -mikrotik,routerboard-ltap-lte6) - migrate_leds "^rbltaplte6:=$boardonly:" +mikrotik,routerboard-ltap2hnd) + migrate_leds "^rbltap2hnd:=$boardonly:" mikrotik,routerboard-m11g) migrate_leds "^rbm11g:=$boardonly:" mikrotik,routerboard-m33g) diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index 9f41cbee64..c457de5bb1 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -29,7 +29,7 @@ platform_do_upgrade() { ;; mikrotik,routerboard-750gr3|\ mikrotik,routerboard-m11g|\ - mikrotik,routerboard-ltap-lte6) + mikrotik,routerboard-ltap2hnd) [ -z "$(rootfs_type)" ] && mtd erase firmware ;; mikrotik,routerboard-m33g)