Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v2023.2.x] treewide: pending devices and bugfixes from master #3314

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/user/supported_devices.rst
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,7 @@ ramips-mt7620

- EX3700
- EX3800
- EX6130

* Nexx

Expand Down Expand Up @@ -462,7 +463,7 @@ ramips-mt7621
* Xiaomi

- Xiaomi Mi Router 3G (v1, v2)
- Xiaomi Mi Router 4A (Gigabit Edition v1)
- Xiaomi Mi Router 4A (Gigabit Edition v1, v2)

* ZBT

Expand Down Expand Up @@ -500,7 +501,7 @@ ramips-mt76x8

- Archer C20 (v4, v5)
- Archer C50 (v3, v4)
- RE200 (v2, v3)
- RE200 (v2, v3, v4)
- TL-MR3020 (v3)
- TL-MR3420 (v5)
- TL-MR6400 (v5)
Expand Down
4 changes: 2 additions & 2 deletions package/gluon-core/luasrc/usr/lib/lua/gluon/ethernet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ end
local function is_swconfig()
local has = false

uci:foreach("system", "switch", function()
uci:foreach("network", "switch", function()
has = true
end)

uci:foreach("system", "switch_vlan", function()
uci:foreach("network", "switch_vlan", function()
has = true
end)

Expand Down
6 changes: 6 additions & 0 deletions targets/ath79-generic
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,12 @@ device('siemens-ws-ap3610', 'siemens_ws-ap3610', {

-- Sophos

device('sophos-ap15', 'sophos_ap15', {
packages = ATH10K_PACKAGES_QCA9880,
factory = false,
broken = true, -- no button and no external console port
})

device('sophos-ap100', 'sophos_ap100', {
packages = ATH10K_PACKAGES_QCA9880,
factory = false,
Expand Down
5 changes: 5 additions & 0 deletions targets/ramips-mt7620
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ device('netgear-ex3700', 'netgear_ex3700', {
factory_ext = '.chk',
})

device('netgear-ex6130', 'netgear_ex6130', {
factory_ext = '.chk',
})


-- Nexx

device('nexx-wt3020-8m', 'nexx_wt3020-8m', {
Expand Down
4 changes: 4 additions & 0 deletions targets/ramips-mt7621
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ device('xiaomi-mi-router-4a-gigabit-edition', 'xiaomi_mi-router-4a-gigabit', {
factory = false,
})

device('xiaomi-mi-router-4a-gigabit-edition-v2', 'xiaomi_mi-router-4a-gigabit-v2', {
factory = false,
})

device('xiaomi-mi-router-3g', 'xiaomi_mi-router-3g', {
factory = false,
})
Expand Down
2 changes: 2 additions & 0 deletions targets/ramips-mt76x8
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ device('tp-link-re200-v2', 'tplink_re200-v2')

device('tp-link-re200-v3', 'tplink_re200-v3')

device('tp-link-re200-v4', 'tplink_re200-v4')

device('tp-link-tl-mr3020-v3', 'tplink_tl-mr3020-v3', {
factory = false,
extra_images = {
Expand Down