Skip to content

Commit 335fae1

Browse files
neocturneneocturne
committed
build: drop GLUON_WLAN_MESH variable
1 parent 02c7503 commit 335fae1

File tree

8 files changed

+45
-57
lines changed

8 files changed

+45
-57
lines changed

‎Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ $(eval $(call mkabspath,GLUON_TARGETSDIR))
4040
$(eval $(call mkabspath,GLUON_PATCHESDIR))
4141

4242
GLUON_MULTIDOMAIN ?= 0
43-
GLUON_WLAN_MESH ?= 11s
4443
GLUON_DEBUG ?= 0
4544

46-
export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_WLAN_MESH GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
45+
export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
4746
GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR
4847

4948
show-release:

‎targets/ar71xx-generic

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
22
config 'CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=64'
33

4-
local ATH10K_PACKAGES = {}
5-
local ATH10K_PACKAGES_QCA9887 = {}
6-
local ATH10K_PACKAGES_QCA9888 = {}
7-
if env.GLUON_WLAN_MESH == '11s' then
8-
ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
9-
ATH10K_PACKAGES_QCA9887 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9887', '-ath10k-firmware-qca9887-ct'}
10-
ATH10K_PACKAGES_QCA9888 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9888', '-ath10k-firmware-qca9888-ct'}
11-
end
4+
local ATH10K_PACKAGES = {
5+
'kmod-ath10k',
6+
'-kmod-ath10k-ct',
7+
'ath10k-firmware-qca988x',
8+
'-ath10k-firmware-qca988x-ct',
9+
}
10+
local ATH10K_PACKAGES_QCA9887 = {
11+
'kmod-ath10k',
12+
'-kmod-ath10k-ct',
13+
'ath10k-firmware-qca9887',
14+
'-ath10k-firmware-qca9887-ct',
15+
}
16+
local ATH10K_PACKAGES_QCA9888 = {
17+
'kmod-ath10k',
18+
'-kmod-ath10k-ct',
19+
'ath10k-firmware-qca9888',
20+
'-ath10k-firmware-qca9888-ct',
21+
}
1222

1323

1424
-- 8devices
@@ -307,7 +317,6 @@ device('tp-link-archer-c58-v1', 'archer-c58-v1', {
307317

308318
device('tp-link-archer-c59-v1', 'archer-c59-v1', {
309319
packages = ATH10K_PACKAGES_QCA9888,
310-
broken = (env.GLUON_WLAN_MESH ~= '11s'),
311320
})
312321

313322
device('tp-link-archer-c60-v1', 'archer-c60-v1', {

‎targets/ar71xx-nand

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
22

3-
local ATH10K_PACKAGES = {}
4-
if env.GLUON_WLAN_MESH == '11s' then
5-
ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
6-
end
3+
local ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
74

85

96
defaults {

‎targets/ipq40xx-generic

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
local ATH10K_PACKAGES_IPQ40XX = {}
2-
local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {}
3-
if env.GLUON_WLAN_MESH == '11s' then
4-
ATH10K_PACKAGES_IPQ40XX = {
5-
'kmod-ath10k',
6-
'-kmod-ath10k-ct',
7-
'ath10k-firmware-qca4019',
8-
'-ath10k-firmware-qca4019-ct',
9-
}
10-
ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
11-
'kmod-ath10k',
12-
'-kmod-ath10k-ct',
13-
'ath10k-firmware-qca4019',
14-
'-ath10k-firmware-qca4019-ct',
15-
'ath10k-firmware-qca9888',
16-
'-ath10k-firmware-qca9888-ct',
17-
}
18-
end
1+
local ATH10K_PACKAGES_IPQ40XX = {
2+
'kmod-ath10k',
3+
'-kmod-ath10k-ct',
4+
'ath10k-firmware-qca4019',
5+
'-ath10k-firmware-qca4019-ct',
6+
}
7+
local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
8+
'kmod-ath10k',
9+
'-kmod-ath10k-ct',
10+
'ath10k-firmware-qca4019',
11+
'-ath10k-firmware-qca4019-ct',
12+
'ath10k-firmware-qca9888',
13+
'-ath10k-firmware-qca9888-ct',
14+
}
1915

2016

2117
defaults {

‎targets/ramips-mt7621

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
device('asus-rt-ac57u', 'asus_rt-ac57u', {
44
factory = false,
5-
broken = (env.GLUON_WLAN_MESH ~= '11s'),
65
})
76

87

98
-- D-Link
109

11-
device('d-link-dir-860l-b1', 'dir-860l-b1', {
12-
broken = (env.GLUON_WLAN_MESH ~= '11s'),
13-
})
10+
device('d-link-dir-860l-b1', 'dir-860l-b1')
1411

1512

1613
-- Netgear
@@ -28,12 +25,10 @@ device('zbt-wg3526-16m', 'zbt-wg3526-16M', {
2825
manifest_aliases = {
2926
'zbt-wg3526',
3027
},
31-
broken = (env.GLUON_WLAN_MESH ~= '11s'),
3228
})
3329

3430
device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
3531
factory = false,
36-
broken = (env.GLUON_WLAN_MESH ~= '11s'),
3732
})
3833

3934

‎targets/sunxi-cortexa7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ device('lemaker-banana-pro', 'sun7i-a20-bananapro', {
1313
})
1414

1515
device('lamobo-r1', 'sun7i-a20-lamobo-r1', {
16-
broken = true, -- AP+IBSS and AP+11s not working
16+
broken = true, -- AP+11s not working
1717
})

‎targets/targets.mk

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
1-
GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
2-
31
$(eval $(call GluonTarget,ar71xx,generic))
42
ifneq ($(GLUON_DEPRECATED),0)
53
$(eval $(call GluonTarget,ar71xx,tiny))
64
endif
75
$(eval $(call GluonTarget,ar71xx,nand))
86
$(eval $(call GluonTarget,brcm2708,bcm2708))
97
$(eval $(call GluonTarget,brcm2708,bcm2709))
8+
$(eval $(call GluonTarget,ipq40xx,generic))
9+
$(eval $(call GluonTarget,ipq806x,generic))
1010
$(eval $(call GluonTarget,lantiq,xway))
1111
$(eval $(call GluonTarget,mpc85xx,generic))
1212
$(eval $(call GluonTarget,mpc85xx,p1020))
13+
$(eval $(call GluonTarget,ramips,mt7620))
1314
$(eval $(call GluonTarget,ramips,mt7621))
15+
$(eval $(call GluonTarget,ramips,mt76x8))
16+
$(eval $(call GluonTarget,ramips,rt305x))
1417
$(eval $(call GluonTarget,sunxi,cortexa7))
1518
$(eval $(call GluonTarget,x86,generic))
1619
$(eval $(call GluonTarget,x86,geode))
1720
$(eval $(call GluonTarget,x86,64))
1821

19-
ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
20-
$(eval $(call GluonTarget,ipq40xx,generic))
21-
$(eval $(call GluonTarget,ipq806x,generic))
22-
$(eval $(call GluonTarget,ramips,mt7620))
23-
$(eval $(call GluonTarget,ramips,mt76x8))
24-
$(eval $(call GluonTarget,ramips,rt305x))
25-
endif
2622

2723
ifneq ($(BROKEN),)
2824
$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
2925
$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
30-
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
26+
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
3127
endif

‎targets/x86.inc

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
config 'CONFIG_VDI_IMAGES=y'
22
config 'CONFIG_VMDK_IMAGES=y'
33

4-
local ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887', 'ath10k-firmware-qca988x'}
5-
if env.GLUON_WLAN_MESH == 'ibss' then
6-
ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887-ct', 'ath10k-firmware-qca988x-ct'}
7-
end
8-
94
packages {
105
'kmod-3c59x',
116
'kmod-8139cp',
@@ -37,6 +32,7 @@ packages {
3732
'kmod-usb2',
3833
'kmod-usb3',
3934
'kmod-usb-serial',
35+
'kmod-ath10k-ct',
36+
'ath10k-firmware-qca9887',
37+
'ath10k-firmware-qca988x',
4038
}
41-
42-
packages(ATH10K_PACKAGES)

0 commit comments

Comments
 (0)