Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: move WIRELESS_MODULE to machine config files 

Which wireless module to use belongs more to the machine config files in
the BSP layer, than to the generic wireless packagegroup.

https://jira.digi.com/browse/DEL-1858

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-10-15 13:45:03 +02:00
parent 21ddc862fa
commit afd194568f
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-arm/conf/machine/include/ccardimx28.inc
View File

@ -16,12 +16,16 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# wpa_supplicant driver to use in '/etc/network/interfaces' # wpa_supplicant driver to use in '/etc/network/interfaces'
WPA_DRIVER = "nl80211" WPA_DRIVER = "nl80211"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
# Firmware # Firmware
MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE ?= ""
MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}" MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
MACHINE_FEATURES += "alsa touchscreen" MACHINE_FEATURES += "alsa touchscreen"

6
meta-digi-arm/conf/machine/include/ccimx51.inc
View File

@ -16,11 +16,15 @@ UBOOT_ENTRYPOINT = "0x90008000"
UBOOT_SUFFIX = "bin" UBOOT_SUFFIX = "bin"
UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}"
# Firmware # Firmware
MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" MACHINE_FIRMWARE = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver"

6
meta-digi-arm/conf/machine/include/ccimx53.inc
View File

@ -16,11 +16,15 @@ UBOOT_ENTRYPOINT = "0x70008000"
UBOOT_SUFFIX = "bin" UBOOT_SUFFIX = "bin"
UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}" UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}"
# Firmware # Firmware
MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" MACHINE_FIRMWARE = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash" MACHINE_EXTRA_RDEPENDS += "mtd-utils-ubifs nvram ubootenv update-flash"
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-mma7455l"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-smsc911x"
MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver" MACHINE_EXTRA_RRECOMMENDS += "kernel-module-scc2-driver"

5
meta-digi-arm/conf/machine/include/ccimx6.inc
View File

@ -16,6 +16,9 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# wpa_supplicant driver to use in '/etc/network/interfaces' # wpa_supplicant driver to use in '/etc/network/interfaces'
WPA_DRIVER = "nl80211" WPA_DRIVER = "nl80211"
# Wireless external module
WIRELESS_MODULE ?= ""
# Firmware # Firmware
MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE ?= ""
MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
@ -28,7 +31,7 @@ MACHINE_EXTRA_RDEPENDS += " \
parted \ parted \
u-boot-fw-utils \ u-boot-fw-utils \
" "
MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins" MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth" MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"

6
meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
View File

@ -8,18 +8,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup inherit packagegroup
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append_mx5 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-redpine', '', d)}"
WIRELESS_MODULE_append_mxs = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
# WIRELESS_MODULE_append_mx6 = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
crda \ crda \
wireless-tools \ wireless-tools \
wpa-supplicant \ wpa-supplicant \
wpa-supplicant-cli \ wpa-supplicant-cli \
wpa-supplicant-passphrase \ wpa-supplicant-passphrase \
${WIRELESS_MODULE} \
" "
RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools" RDEPENDS_${PN}_append_mxs = " iw ath-prop-tools"