targets: remove check if ATH10K_PACKAGES is set

as GLUON_WLAN_MESH now is set by default, ATH10K_PACKAGES is set by default, too
This commit is contained in:
Andreas Ziegler 2018-01-26 03:06:15 +01:00
parent a99fdf7919
commit e92140c593
2 changed files with 2 additions and 20 deletions

View File

@ -1,9 +1,5 @@
ATH10K_PACKAGES= ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
ATH10K_PACKAGES_QCA9887= ATH10K_PACKAGES_QCA9887=
if [ "$GLUON_WLAN_MESH" = '11s' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
fi
if [ "$GLUON_WLAN_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'
@ -115,11 +111,9 @@ device onion-omega onion-omega
# OpenMesh # OpenMesh
if [ "$ATH10K_PACKAGES" ]; then
device openmesh-mr1750 mr1750 MR1750 device openmesh-mr1750 mr1750 MR1750
alias openmesh-mr1750v2 alias openmesh-mr1750v2
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
fi
device openmesh-mr600 mr600 MR600 device openmesh-mr600 mr600 MR600
alias openmesh-mr600v2 alias openmesh-mr600v2
@ -137,11 +131,9 @@ alias openmesh-om2p-lc
device openmesh-om5p om5p OM5P device openmesh-om5p om5p OM5P
alias openmesh-om5p-an alias openmesh-om5p-an
if [ "$ATH10K_PACKAGES" ]; then
device openmesh-om5p-ac om5pac OM5PAC device openmesh-om5p-ac om5pac OM5PAC
alias openmesh-om5p-acv2 alias openmesh-om5p-acv2
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
fi
# TP-Link # TP-Link
@ -180,7 +172,6 @@ device tp-link-tl-wdr4300-v1 tl-wdr4300-v1
device tp-link-tl-wr2543n-nd-v1 tl-wr2543-v1 device tp-link-tl-wr2543n-nd-v1 tl-wr2543-v1
if [ "$ATH10K_PACKAGES" ]; then
device tp-link-archer-c5-v1 archer-c5-v1 device tp-link-archer-c5-v1 archer-c5-v1
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
@ -210,7 +201,6 @@ fi
device tp-link-re450 re450 device tp-link-re450 re450
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
fi
# Ubiquiti # Ubiquiti
@ -266,7 +256,6 @@ if [ "$BROKEN" ]; then
device ubiquiti-ls-sr71 ubnt-ls-sr71 # BROKEN: Untested device ubiquiti-ls-sr71 ubnt-ls-sr71 # BROKEN: Untested
fi fi
if [ "$ATH10K_PACKAGES" ]; then
device ubiquiti-unifi-ac-lite ubnt-unifiac-lite device ubiquiti-unifi-ac-lite ubnt-unifiac-lite
alias ubiquiti-unifi-ac-mesh alias ubiquiti-unifi-ac-mesh
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
@ -275,7 +264,6 @@ factory
device ubiquiti-unifi-ac-pro ubnt-unifiac-pro device ubiquiti-unifi-ac-pro ubnt-unifiac-pro
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
factory factory
fi
# Western Digital # Western Digital

View File

@ -1,8 +1,4 @@
ATH10K_PACKAGES= ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
if [ "$GLUON_WLAN_MESH" = '11s' ]; then
ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
fi
if [ "$GLUON_WLAN_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
@ -10,7 +6,5 @@ fi
# TP-Link # TP-Link
if [ "$ATH10K_PACKAGES" ]; then
device tp-link-archer-c2600 C2600 device tp-link-archer-c2600 C2600
packages $ATH10K_PACKAGES packages $ATH10K_PACKAGES
fi