bluez5: unify config file for all platforms

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-01-09 12:47:10 +01:00
parent bc5a22f883
commit f81982571c
12 changed files with 21 additions and 38 deletions

View File

@ -37,6 +37,9 @@ KERNEL_DEVICETREE ?= " \
SERIAL_CONSOLES ?= "115200;ttymxc3"
# Bluetooth interface
BT_DEVICE_NAME ?= "cc6qp"
# Bluetooth tty
BT_TTY ?= "ttymxc1"

View File

@ -38,6 +38,9 @@ KERNEL_DEVICETREE ?= " \
SERIAL_CONSOLES ?= "115200;ttymxc3"
# Bluetooth interface
BT_DEVICE_NAME ?= "cc6"
# Bluetooth tty
BT_TTY ?= "ttymxc1"

View File

@ -12,6 +12,9 @@ include conf/machine/include/tune-cortexa7.inc
UBOOT_PREFIX = "u-boot"
UBOOT_SUFFIX = "imx"
# Bluetooth interface
BT_DEVICE_NAME ?= "cc6ul"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"

View File

@ -22,6 +22,9 @@ SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
# Linux kernel configuration
KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
# Bluetooth interface
BT_DEVICE_NAME ?= "cc8mn"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"

View File

@ -29,6 +29,9 @@ RAM_CONFIGS = "1.2GHz_512MB_16bit 1.2GHz_1GB_16bit 1.2GHz_1GB_32bit 1.2GHz_2GB_3
# Linux kernel configuration
KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8x_defconfig"
# Bluetooth interface
BT_DEVICE_NAME ?= "cc8x"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-qualcomm', '', d)}"

View File

@ -1,12 +0,0 @@
[General]
# Default adapter name
# Defaults to 'BlueZ X.YZ'
Name = cc8x
[Policy]
# AutoEnable defines option to enable all controllers when they are found.
# This includes adapters present on start as well as adapters that are plugged
# in later on. Defaults to 'false'.
AutoEnable=true

View File

@ -1,12 +0,0 @@
[General]
# Default adapter name
# Defaults to 'BlueZ X.YZ'
Name = cc6qp
[Policy]
# AutoEnable defines option to enable all controllers when they are found.
# This includes adapters present on start as well as adapters that are plugged
# in later on. Defaults to 'false'.
AutoEnable=true

View File

@ -2,7 +2,7 @@
# Default adapter name
# Defaults to 'BlueZ X.YZ'
Name = cc6
Name = ##BT_DEVICE_NAME##
#[Policy]

View File

@ -1,12 +0,0 @@
[General]
# Default adapter name
# Defaults to 'BlueZ X.YZ'
Name = cc6ul
[Policy]
# AutoEnable defines option to enable all controllers when they are found.
# This includes adapters present on start as well as adapters that are plugged
# in later on. Defaults to 'false'.
AutoEnable=true

View File

@ -2,7 +2,7 @@
# Default adapter name
# Defaults to 'BlueZ X.YZ'
Name = cc8mn
Name = ##BT_DEVICE_NAME##
[Policy]

View File

@ -40,6 +40,8 @@ do_install_append() {
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \
${D}${sysconfdir}/bluetooth/main.conf
if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'experimental', 'experimental', '', d)}" ]; then
sed -i '/^SSD_OPTIONS/a SSD_OPTIONS="${SSD_OPTIONS} --experimental"' ${D}${INIT_D_DIR}/bluetooth
fi

View File

@ -33,6 +33,8 @@ do_install_append() {
install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/bluetooth-init.service ${D}${systemd_unitdir}/system/bluetooth-init.service
install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
sed -i -e "s,##BT_DEVICE_NAME##,${BT_DEVICE_NAME},g" \
${D}${sysconfdir}/bluetooth/main.conf
# Staging bluetooth internal headers and libs to allow other recipes
# to link against them