nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: introduce GLUON_WLAN_MESH build variable (#1298)

Browse Source 
defaults to 11s, allowing to build devices without IBSS-support

obsoletes GLUON_ATH10K_MESH
This commit is contained in:
Tata 2018-01-10 15:49:33 +01:00 committed by Andreas Ziegler
parent e65dc0e7dd
commit 919dda90b3
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -35,11 +35,12 @@ $(GLUON_SITEDIR)/site.mk:
include $(GLUON_SITEDIR)/site.mk include $(GLUON_SITEDIR)/site.mk
GLUON_WLAN_MESH ?= 11s
GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line) GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line)
export GLUON_RELEASE GLUON_ATH10K_MESH GLUON_REGION GLUON_DEBUG export GLUON_RELEASE GLUON_WLAN_MESH GLUON_REGION GLUON_DEBUG
show-release: show-release:
@echo '$(GLUON_RELEASE)' @echo '$(GLUON_RELEASE)'

2
docs/index.rst
View File

@ -210,7 +210,7 @@ ar71xx-generic
- My Net N750 - My Net N750
.. [#ath10k] .. [#ath10k]
Device uses the ath10k WLAN driver; no image is built unless GLUON_ATH10K_MESH Device uses the ath10k WLAN driver; images are built for 11s by default unless GLUON_WLAN_MESH
is set as described in :ref:`getting-started-make-variables` is set as described in :ref:`getting-started-make-variables`
ar71xx-nand ar71xx-nand

13
docs/user/getting_started.rst
View File

@ -155,13 +155,14 @@ usually be set on the command line or in ``site.mk``.
Common variables Common variables
................ ................
GLUON_ATH10K_MESH GLUON_WLAN_MESH
While Gluon does support some hardware with ath10k-based 5GHz WLAN, these WLAN adapters don't work While Gluon does support some hardware with ath10k-based 5GHz WLAN. ath10k can't support IBSS and 11s
well for meshing at the moment, so building images for these models is disabled by default. In addition, meshing in the same image due to WLAN firmware restrictions.
ath10k can't support IBSS and 11s meshing in the same image due to WLAN firmware restrictions.
Setting GLUON_ATH10K_MESH to ``11s`` or ``ibss`` will enable generation of images for ath10k devices Setting GLUON_MESH_MESH to ``11s`` or ``ibss`` will enable generation of images for ath10k devices
and install the firmware for the corresponding WLAN mode. and install the firmware for the corresponding WLAN mode. Specifically setting to ``11s`` will also
enable the generation of images for targets that are able to run only AP+11s but not AP+IBSS, like
ralink or mediatek. Defaults to ``11s``.
GLUON_BRANCH GLUON_BRANCH
Sets the default branch of the autoupdater. If unset, the autoupdater is disabled Sets the default branch of the autoupdater. If unset, the autoupdater is disabled

4
targets/ar71xx-generic
View File

@ -1,10 +1,10 @@
ATH10K_PACKAGES= ATH10K_PACKAGES=
ATH10K_PACKAGES_QCA9887= ATH10K_PACKAGES_QCA9887=
if [ "$GLUON_ATH10K_MESH" = '11s' ]; then if [ "$GLUON_WLAN_MESH" = '11s' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct' ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
fi fi
if [ "$GLUON_ATH10K_MESH" = 'ibss' ]; then if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca988x ath10k-firmware-qca988x-ct' 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_QCA9887='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca9887 ath10k-firmware-qca9887-ct'
fi fi

4
targets/ipq806x
View File

@ -1,9 +1,9 @@
ATH10K_PACKAGES= ATH10K_PACKAGES=
if [ "$GLUON_ATH10K_MESH" = '11s' ]; then if [ "$GLUON_WLAN_MESH" = '11s' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct' ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
fi fi
if [ "$GLUON_ATH10K_MESH" = 'ibss' ]; then if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca99x0 ath10k-firmware-qca99x0-ct' ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca99x0 ath10k-firmware-qca99x0-ct'
fi fi

11
targets/targets.mk
View File

@ -1,3 +1,5 @@
GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
$(eval $(call GluonTarget,ar71xx,generic)) $(eval $(call GluonTarget,ar71xx,generic))
$(eval $(call GluonTarget,ar71xx,tiny,generic)) $(eval $(call GluonTarget,ar71xx,tiny,generic))
$(eval $(call GluonTarget,ar71xx,nand)) $(eval $(call GluonTarget,ar71xx,nand))
@ -9,13 +11,16 @@ $(eval $(call GluonTarget,x86,generic))
$(eval $(call GluonTarget,x86,geode)) $(eval $(call GluonTarget,x86,geode))
$(eval $(call GluonTarget,x86,64)) $(eval $(call GluonTarget,x86,64))
ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
$(eval $(call GluonTarget,ramips,mt7620))
$(eval $(call GluonTarget,ramips,mt7628))
$(eval $(call GluonTarget,ramips,rt305x))
endif
ifneq ($(BROKEN),) ifneq ($(BROKEN),)
$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support $(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested $(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
$(eval $(call GluonTarget,ipq806x)) # BROKEN: Untested $(eval $(call GluonTarget,ipq806x)) # BROKEN: Untested
$(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support $(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support
$(eval $(call GluonTarget,ramips,mt7620)) # BROKEN: No AP+IBSS support
$(eval $(call GluonTarget,ramips,mt7628)) # BROKEN: No AP+IBSS support
$(eval $(call GluonTarget,ramips,rt305x)) # BROKEN: No AP+IBSS support
$(eval $(call GluonTarget,sunxi)) # BROKEN: Untested $(eval $(call GluonTarget,sunxi)) # BROKEN: Untested
endif endif