From 83eb3a30c777285c7bdc529142cd09b0a8885470 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 5 May 2020 13:31:38 +0200 Subject: [PATCH] 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 --- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 1 - meta-digi-arm/conf/machine/ccimx6sbc.conf | 3 --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 4 ---- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 4 ---- meta-digi-arm/conf/machine/include/ccimx8x.inc | 4 ---- meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 +++- 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index c033e6f50..5c3d16973 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -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 += " \ diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index ea98b6b24..3b643e325 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -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)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 1c254af7a..55a23623f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -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)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index a3077cee1..4cb54003b 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -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)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 00b213091..62d4cae2a 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -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)}" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index cc812b6e2..5e9a3d501 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -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"