From 335fae102523be155b87fe5abbc05bef96ede56f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 5 Nov 2019 20:49:55 +0100
Subject: [PATCH] build: drop GLUON_WLAN_MESH variable

---
 Makefile                |  3 +--
 targets/ar71xx-generic  | 27 ++++++++++++++++++---------
 targets/ar71xx-nand     |  5 +----
 targets/ipq40xx-generic | 32 ++++++++++++++------------------
 targets/ramips-mt7621   |  7 +------
 targets/sunxi-cortexa7  |  2 +-
 targets/targets.mk      | 16 ++++++----------
 targets/x86.inc         | 10 +++-------
 8 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/Makefile b/Makefile
index 6d95a398..a9849104 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,9 @@ $(eval $(call mkabspath,GLUON_TARGETSDIR))
 $(eval $(call mkabspath,GLUON_PATCHESDIR))
 
 GLUON_MULTIDOMAIN ?= 0
-GLUON_WLAN_MESH ?= 11s
 GLUON_DEBUG ?= 0
 
-export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_WLAN_MESH GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
+export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
 	 GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR
 
 show-release:
diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
index 161ca795..5a76f87a 100644
--- a/targets/ar71xx-generic
+++ b/targets/ar71xx-generic
@@ -1,14 +1,24 @@
 config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
 config 'CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=64'
 
-local ATH10K_PACKAGES = {}
-local ATH10K_PACKAGES_QCA9887 = {}
-local ATH10K_PACKAGES_QCA9888 = {}
-if env.GLUON_WLAN_MESH == '11s' then
-	ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
-	ATH10K_PACKAGES_QCA9887 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9887', '-ath10k-firmware-qca9887-ct'}
-	ATH10K_PACKAGES_QCA9888 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9888', '-ath10k-firmware-qca9888-ct'}
-end
+local ATH10K_PACKAGES = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'ath10k-firmware-qca988x',
+	'-ath10k-firmware-qca988x-ct',
+}
+local ATH10K_PACKAGES_QCA9887 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'ath10k-firmware-qca9887',
+	'-ath10k-firmware-qca9887-ct',
+}
+local ATH10K_PACKAGES_QCA9888 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'ath10k-firmware-qca9888',
+	'-ath10k-firmware-qca9888-ct',
+}
 
 
 -- 8devices
@@ -307,7 +317,6 @@ device('tp-link-archer-c58-v1', 'archer-c58-v1', {
 
 device('tp-link-archer-c59-v1', 'archer-c59-v1', {
 	packages = ATH10K_PACKAGES_QCA9888,
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 device('tp-link-archer-c60-v1', 'archer-c60-v1', {
diff --git a/targets/ar71xx-nand b/targets/ar71xx-nand
index dcedccb8..e52b82e0 100644
--- a/targets/ar71xx-nand
+++ b/targets/ar71xx-nand
@@ -1,9 +1,6 @@
 config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
 
-local ATH10K_PACKAGES = {}
-if env.GLUON_WLAN_MESH == '11s' then
-	ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
-end
+local ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
 
 
 defaults {
diff --git a/targets/ipq40xx-generic b/targets/ipq40xx-generic
index e7a67f75..7a912823 100644
--- a/targets/ipq40xx-generic
+++ b/targets/ipq40xx-generic
@@ -1,21 +1,17 @@
-local ATH10K_PACKAGES_IPQ40XX = {}
-local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {}
-if env.GLUON_WLAN_MESH == '11s' then
-	ATH10K_PACKAGES_IPQ40XX = {
-		'kmod-ath10k',
-		'-kmod-ath10k-ct',
-		'ath10k-firmware-qca4019',
-		'-ath10k-firmware-qca4019-ct',
-	}
-	ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
-		'kmod-ath10k',
-		'-kmod-ath10k-ct',
-		'ath10k-firmware-qca4019',
-		'-ath10k-firmware-qca4019-ct',
-		'ath10k-firmware-qca9888',
-		'-ath10k-firmware-qca9888-ct',
-	}
-end
+local ATH10K_PACKAGES_IPQ40XX = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'ath10k-firmware-qca4019',
+	'-ath10k-firmware-qca4019-ct',
+}
+local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
+	'kmod-ath10k',
+	'-kmod-ath10k-ct',
+	'ath10k-firmware-qca4019',
+	'-ath10k-firmware-qca4019-ct',
+	'ath10k-firmware-qca9888',
+	'-ath10k-firmware-qca9888-ct',
+}
 
 
 defaults {
diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
index 6808a3e6..4ffe045b 100644
--- a/targets/ramips-mt7621
+++ b/targets/ramips-mt7621
@@ -2,15 +2,12 @@
 
 device('asus-rt-ac57u', 'asus_rt-ac57u', {
 	factory = false,
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 
 -- D-Link
 
-device('d-link-dir-860l-b1', 'dir-860l-b1', {
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
-})
+device('d-link-dir-860l-b1', 'dir-860l-b1')
 
 
 -- Netgear
@@ -28,12 +25,10 @@ device('zbt-wg3526-16m', 'zbt-wg3526-16M', {
 	manifest_aliases = {
 		'zbt-wg3526',
 	},
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
 	factory = false,
-	broken = (env.GLUON_WLAN_MESH ~= '11s'),
 })
 
 
diff --git a/targets/sunxi-cortexa7 b/targets/sunxi-cortexa7
index 8bc73e68..4946ed0b 100644
--- a/targets/sunxi-cortexa7
+++ b/targets/sunxi-cortexa7
@@ -13,5 +13,5 @@ device('lemaker-banana-pro', 'sun7i-a20-bananapro', {
 })
 
 device('lamobo-r1', 'sun7i-a20-lamobo-r1', {
-	broken = true, -- AP+IBSS and AP+11s not working
+	broken = true, -- AP+11s not working
 })
diff --git a/targets/targets.mk b/targets/targets.mk
index ec886aa0..5d2a189b 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -1,5 +1,3 @@
-GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
-
 $(eval $(call GluonTarget,ar71xx,generic))
 ifneq ($(GLUON_DEPRECATED),0)
 $(eval $(call GluonTarget,ar71xx,tiny))
@@ -7,25 +5,23 @@ endif
 $(eval $(call GluonTarget,ar71xx,nand))
 $(eval $(call GluonTarget,brcm2708,bcm2708))
 $(eval $(call GluonTarget,brcm2708,bcm2709))
+$(eval $(call GluonTarget,ipq40xx,generic))
+$(eval $(call GluonTarget,ipq806x,generic))
 $(eval $(call GluonTarget,lantiq,xway))
 $(eval $(call GluonTarget,mpc85xx,generic))
 $(eval $(call GluonTarget,mpc85xx,p1020))
+$(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
+$(eval $(call GluonTarget,ramips,mt76x8))
+$(eval $(call GluonTarget,ramips,rt305x))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))
 $(eval $(call GluonTarget,x86,64))
 
-ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
-$(eval $(call GluonTarget,ipq40xx,generic))
-$(eval $(call GluonTarget,ipq806x,generic))
-$(eval $(call GluonTarget,ramips,mt7620))
-$(eval $(call GluonTarget,ramips,mt76x8))
-$(eval $(call GluonTarget,ramips,rt305x))
-endif
 
 ifneq ($(BROKEN),)
 $(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
 $(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
-$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
+$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
 endif
diff --git a/targets/x86.inc b/targets/x86.inc
index 3e3b5e53..66e0ebee 100644
--- a/targets/x86.inc
+++ b/targets/x86.inc
@@ -1,11 +1,6 @@
 config 'CONFIG_VDI_IMAGES=y'
 config 'CONFIG_VMDK_IMAGES=y'
 
-local ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887', 'ath10k-firmware-qca988x'}
-if env.GLUON_WLAN_MESH == 'ibss' then
-	ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887-ct', 'ath10k-firmware-qca988x-ct'}
-end
-
 packages {
 	'kmod-3c59x',
 	'kmod-8139cp',
@@ -37,6 +32,7 @@ packages {
 	'kmod-usb2',
 	'kmod-usb3',
 	'kmod-usb-serial',
+	'kmod-ath10k-ct',
+	'ath10k-firmware-qca9887',
+	'ath10k-firmware-qca988x',
 }
-
-packages(ATH10K_PACKAGES)