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

p2p: move common P2P variables to digi-defaults.inc for simplicity 

- WLAN_P2P_INTERFACE is the same for all platforms: "p2p0".
- WLAN_P2P_DEVICE_NAME can be built out of ${DIGI_FAMILY} except for
  the ccimx6qp, that's why it has a weak default assignment.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2020-05-05 13:31:38 +02:00
parent fb2e7e37f4
commit 83eb3a30c7
6 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -10,7 +10,6 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod
HAS_WIFI_VIRTWLANS = "true"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx6qp-p2p"
MACHINE_EXTRA_RRECOMMENDS += " \

3
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -7,9 +7,6 @@ include conf/machine/include/ccimx6.inc
HAS_WIFI_VIRTWLANS = "false"
# Wireless p2p interface
WLAN_P2P_DEVICE_NAME ?= "ccimx6-p2p"
# Firmware
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"

4
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -22,10 +22,6 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx6ul-p2p"
# Firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"

4
meta-digi-arm/conf/machine/include/ccimx8mn.inc
View File

@ -36,10 +36,6 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx8mn-p2p"
# Firmware
MACHINE_FIRMWARE ?= "firmware-imx-sdma firmware-imx-easrc"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}"

4
meta-digi-arm/conf/machine/include/ccimx8x.inc
View File

@ -39,10 +39,6 @@ WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"
HAS_WIFI_VIRTWLANS = "true"
# Wireless p2p interface
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ?= "ccimx8x-p2p"
# Firmware
MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma"
MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}"

4
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -25,7 +25,7 @@ HAVE_BT = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '1', ''
HAVE_GUI = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '1', '', d)}"
#
# Ethernet configuration used in recipes
# Ethernet, Wi-Fi, and Bluetooth configuration used in recipes
#
# ETHx_MODE, WLANx_MODE accepted values: 'dhcp' or 'static'
#
@ -44,6 +44,8 @@ WLAN1_STATIC_IP ?= "192.168.46.30"
WLAN1_STATIC_NETMASK ?= "255.255.255.0"
P2P0_STATIC_IP ?= "192.168.45.30"
P2P0_STATIC_NETMASK ?= "255.255.255.0"
WLAN_P2P_INTERFACE ?= "p2p0"
WLAN_P2P_DEVICE_NAME ??= "${DIGI_FAMILY}-p2p"
# Digi BSP default settings
IMAGE_CLASSES = "image_types_digi"