diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-07 10:34:33 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-04-08 13:46:30 +0200 |
| commit | f761f4052c411bababed2d2e9d8dc3f43380e4ee (patch) | |
| tree | 8436978a65ddb3d5dad2a504f77552a5eb79163f /target/linux/ramips/mt7621 | |
| parent | 48b4aab80cd34682616bf7f12c41e35e27a49504 (diff) | |
| download | upstream-f761f4052c411bababed2d2e9d8dc3f43380e4ee.tar.gz upstream-f761f4052c411bababed2d2e9d8dc3f43380e4ee.tar.bz2 upstream-f761f4052c411bababed2d2e9d8dc3f43380e4ee.zip | |
ramips: mt7621: harmonize naming scheme for Mikrotik
So far, image/device/board names for Mikrotik devices in mt7621 have
been used quite inconsistently.
This patch harmonizes the naming scheme by applying the same style
as used lately in ath79, i.e. using "RouterBOARD" as separate word
in the model name (instead of RB prefix for the number) and deriving
the board/device name from that (= make lower case and replace spaces
by hyphens).
This style has already been used for most the model/DEVICE_MODEL
variables in mt7621, so this is essentially just adjusting the remaining
variables to that.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ramips/mt7621')
5 files changed, 20 insertions, 12 deletions
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 66739a7536..cc114da4ee 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 @@ -34,7 +34,7 @@ gnubee,gb-pc2) ucidef_set_led_netdev "lan1" "lan1" "$boardname:green:lan1" "lan1" ucidef_set_led_netdev "lan2" "lan2" "$boardname:green:lan2" "lan2" ;; -mikrotik,rbm11g) +mikrotik,routerboard-m11g) ucidef_set_rssimon "wlan0" "200000" "1" ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssi0" "wlan0" "1" "100" ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssi1" "wlan0" "20" "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 f654574e14..f573a049ce 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 @@ -14,7 +14,7 @@ ramips_setup_interfaces() ;; asiarf,ap7621-nv1|\ lenovo,newifi-d1|\ - mikrotik,rbm33g|\ + mikrotik,routerboard-m33g|\ xiaomi,mir3g|\ xiaomi,mir3g-v2) ucidef_set_interfaces_lan_wan "lan1 lan2" "wan" @@ -31,7 +31,7 @@ ramips_setup_interfaces() linksys,re6500) ucidef_set_interface_lan "lan1 lan2 lan3 lan4" ;; - mikrotik,rbm11g|\ + mikrotik,routerboard-m11g|\ netgear,ex6150|\ thunder,timecloud|\ tplink,re350-v1|\ @@ -39,7 +39,7 @@ ramips_setup_interfaces() ubnt,unifi-nanohd) ucidef_set_interface_lan "lan" ;; - mikrotik,rb750gr3) + mikrotik,routerboard-750gr3) ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan" ;; ubiquiti,edgerouterx|\ @@ -89,9 +89,9 @@ ramips_setup_macs() wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr) label_mac=$wan_mac ;; - mikrotik,rb750gr3|\ - mikrotik,rbm11g|\ - mikrotik,rbm33g) + mikrotik,routerboard-750gr3|\ + mikrotik,routerboard-m11g|\ + mikrotik,routerboard-m33g) label_mac=$(mtd_get_mac_binary hard_config 0x10) ;; zbtlink,zbt-we1326|\ diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches index d3bc85f827..511d9deed8 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches @@ -7,7 +7,7 @@ board_config_update board=$(board_name) case "$board" in -mikrotik,rb750gr3) +mikrotik,routerboard-750gr3) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "17" ;; telco-electronics,x1) 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 e745c2c5d4..73140fd7d5 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 @@ -4,11 +4,19 @@ . /lib/functions/migrations.sh board=$(board_name) +boardonly="${board##*,}" case "$board" in +mikrotik,routerboard-750gr3) + migrate_leds "^rb750gr3:=$boardonly:" +mikrotik,routerboard-m11g) + migrate_leds "^rbm11g:=$boardonly:" +mikrotik,routerboard-m33g) + migrate_leds "^rbm33g:=$boardonly:" netgear,wndr3700-v5) - migrate_leds "^wndr3700v5:=wndr3700-v5:" + migrate_leds "^wndr3700v5:=$boardonly:" ;; + esac migrations_apply system 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 ad10dcbdaa..afb3a52a82 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -27,9 +27,9 @@ platform_do_upgrade() { fi } ;; - mikrotik,rb750gr3|\ - mikrotik,rbm11g|\ - mikrotik,rbm33g) + mikrotik,routerboard-750gr3|\ + mikrotik,routerboard-m11g|\ + mikrotik,routerboard-m33g) [ -z "$(rootfs_type)" ] && mtd erase firmware ;; asus,rt-ac65p|\ |