From a46a7af18d0fe595b54a50c510449b73273b2a41 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 5 May 2020 13:45:19 +0200 Subject: [PATCH] bluetooth: re-use variable DIGI_FAMILY to set BT_DEVICE_NAME for simplicity The variable BT_DEVICE_NAME is used to name the Bluetooth device name on the BlueZ configuration file. Re-use the contents of DIGI_FAMILY (except for ccimx6qp which re-writes it) to simplify platform definitions. Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccimx6sbc.conf | 3 --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 3 --- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 3 --- meta-digi-arm/conf/machine/include/ccimx8x.inc | 3 --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 1 + 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 3b643e325..9f2cc2818 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -37,9 +37,6 @@ KERNEL_DEVICETREE ?= " \ SERIAL_CONSOLES ?= "115200;ttymxc3" -# Bluetooth interface -BT_DEVICE_NAME ?= "cc6" - # Bluetooth tty BT_TTY ?= "ttymxc1" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 55a23623f..d2d182c7c 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -14,9 +14,6 @@ UBOOT_SUFFIX = "imx" STORAGE_MEDIA = "mtd" -# Bluetooth interface -BT_DEVICE_NAME ?= "cc6ul" - # Wireless external module WIRELESS_MODULE ?= "" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index 4cb54003b..64ef81825 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -28,9 +28,6 @@ KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig" STORAGE_MEDIA = "mmc" -# Bluetooth interface -BT_DEVICE_NAME ?= "cc8mn" - # Wireless external module WIRELESS_MODULE ?= "" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 62d4cae2a..25a326412 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -31,9 +31,6 @@ KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig" STORAGE_MEDIA = "mmc" -# Bluetooth interface -BT_DEVICE_NAME ?= "cc8x" - # Wireless external module WIRELESS_MODULE ?= "" WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 5e9a3d501..c68c66233 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -46,6 +46,7 @@ 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" +BT_DEVICE_NAME ??= "${DIGI_FAMILY}" # Digi BSP default settings IMAGE_CLASSES = "image_types_digi"