From 9fdc57c175b453f33af8e656e9079a6b77696b49 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Sat, 26 Jun 2021 02:17:15 +0200
Subject: [PATCH] treewide: drop ar71xx platform specific code
---
.../luasrc/lib/gluon/upgrade/010-primary-mac | 47 -------------------
.../luasrc/lib/gluon/upgrade/020-interfaces | 15 +-----
.../luasrc/usr/lib/lua/gluon/platform.lua | 28 +----------
.../luasrc/lib/gluon/upgrade/320-setup-ifname | 9 +---
4 files changed, 3 insertions(+), 96 deletions(-)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
index 3ff33ee0f..499a33bf1 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/010-primary-mac
@@ -71,40 +71,6 @@ end
-- Entries are matched in the order they are listed
local primary_addrs = {
{interface('lan'), {
- {'ar71xx', 'generic', {
- 'archer-c5',
- 'archer-c58-v1',
- 'archer-c59-v1',
- 'archer-c60-v1',
- 'archer-c7',
- 'archer-c7-v4',
- 'archer-c7-v5',
- 'carambola2',
- 'koala',
- 'mr600',
- 'mr600v2',
- 'mr900',
- 'mr900v2',
- 'mr1750',
- 'mr1750v2',
- 'om2p',
- 'om2pv2',
- 'om2p-hs',
- 'om2p-hsv2',
- 'om2p-hsv3',
- 'om2p-lc',
- 'om5p',
- 'om5p-an',
- 'om5p-ac',
- 'om5p-acv2',
- 'unifi-outdoor-plus',
- 'unifiac-lite',
- 'unifiac-pro',
- }},
- {'ar71xx', 'mikrotik'},
- {'ar71xx', 'nand', {
- 'hiveap-121',
- }},
{'ath79', 'generic', {
'glinet,gl-ar750s-nor',
'ocedo,raccoon',
@@ -136,14 +102,6 @@ local primary_addrs = {
{'x86'},
}},
{interface('wan'), {
- {'ar71xx', 'generic', {
- 'a40',
- 'a60',
- 'archer-c25-v1',
- 'archer-c60-v2',
- 'om2pv4',
- 'om2p-hsv4',
- }},
{'ipq40xx', 'generic', {
'linksys,ea6350v3',
'openmesh,a42',
@@ -158,11 +116,6 @@ local primary_addrs = {
}},
}},
{phy(1), {
- {'ar71xx', 'generic', {
- 'tl-wdr3600',
- 'tl-wdr4300',
- 'tl-wr902ac-v1',
- }},
{'ramips', 'mt7621', {
'dlink,dir-860l-b1',
}},
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
index 9d1b84c88..c242343a2 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
@@ -32,20 +32,7 @@ end
local lan_ifname = iface_exists((network_data.lan or {}).ifname)
local wan_ifname = iface_exists((network_data.wan or {}).ifname)
-if platform.match('ar71xx', 'generic', {
- 'cpe210',
- 'cpe510',
- 'wbs210',
- 'wbs510',
- 'airgateway',
- 'nanostation-m',
- 'nanostation-m-xw',
- 'unifi-outdoor-plus',
- 'uap-pro',
- 'unifiac-pro',
-}) then
- lan_ifname, wan_ifname = wan_ifname, lan_ifname
-elseif platform.match('lantiq') then
+if platform.match('lantiq') then
local switch_data = board_data.switch or {}
local switch0_data = switch_data.switch0 or {}
local roles_data = switch0_data.roles or {}
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
index bcd0bf6f9..5bfe534ee 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua
@@ -25,33 +25,7 @@ function M.match(target, subtarget, boards)
end
function M.is_outdoor_device()
- if M.match('ar71xx', 'generic', {
- 'bullet-m',
- 'cpe210',
- 'cpe510',
- 'wbs210',
- 'wbs510',
- 'lbe-m5',
- 'loco-m-xw',
- 'nanostation-m',
- 'nanostation-m-xw',
- 'rocket-m',
- 'rocket-m-ti',
- 'rocket-m-xw',
- 'unifi-outdoor',
- 'unifi-outdoor-plus',
- }) then
- return true
-
- elseif M.match('ar71xx', 'generic', {'unifiac-lite'}) and
- M.get_model() == 'Ubiquiti UniFi-AC-MESH' then
- return true
-
- elseif M.match('ar71xx', 'generic', {'unifiac-pro'}) and
- M.get_model() == 'Ubiquiti UniFi-AC-MESH-PRO' then
- return true
-
- elseif M.match('ath79', 'generic', {
+ if M.match('ath79', 'generic', {
'devolo,dvl1750x',
'plasmacloud,pa300',
'plasmacloud,pa300e',
diff --git a/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
index b1c87623b..53d60d1c6 100755
--- a/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
+++ b/package/gluon-setup-mode/luasrc/lib/gluon/upgrade/320-setup-ifname
@@ -8,14 +8,7 @@ if sysconfig.setup_ifname then
os.exit(0)
end
-if platform.is_outdoor_device() or
- platform.match('ar71xx', 'generic', {
- 'airgateway',
- 'uap-pro',
- 'unifiac-pro'
- }) or
- platform.match('ar71xx', 'mikrotik')
-then
+if platform.is_outdoor_device() then
sysconfig.setup_ifname = sysconfig.wan_ifname or sysconfig.lan_ifname
else
sysconfig.setup_ifname = sysconfig.lan_ifname or sysconfig.wan_ifname
--
GitLab