From 3ab6c6caa5892522991252e933de4426d4be6d9b Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Wed, 5 Apr 2017 13:24:50 +0200
Subject: [PATCH] meta-digi-dey: Add bluetooth main configuration files

Configure bluetoothd to enable the controller automatically.

https://jira.digi.com/browse/DEL-3711
https://jira.digi.com/browse/DEL-3436
https://jira.digi.com/browse/DEL-3636
https://jira.digi.com/browse/DEL-3955

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../bluez/bluez5-5.41/ccimx6/main.conf               | 12 ++++++++++++
 .../bluez/bluez5-5.41/ccimx6ul/main.conf             | 12 ++++++++++++
 .../recipes-connectivity/bluez/bluez5_5.41.bbappend  |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100644 meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf
 create mode 100644 meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/main.conf

diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf
new file mode 100644
index 000000000..c0908f0b2
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf
@@ -0,0 +1,12 @@
+[General]
+
+# Default adapter name
+# Defaults to 'BlueZ X.YZ'
+Name = cc6
+
+#[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
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/main.conf
new file mode 100644
index 000000000..e3c0cacbc
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/main.conf
@@ -0,0 +1,12 @@
+[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
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
index c6edca2b5..02ac853df 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
@@ -4,6 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
 
 SRC_URI += " \
     file://bluetooth-init \
+    file://main.conf \
     file://0001-hcitool-do-not-show-unsupported-refresh-option.patch \
     file://0002-hcitool-increase-the-shown-connection-limit-to-20.patch \
 "
@@ -37,10 +38,12 @@ PACKAGECONFIG_append = " experimental"
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/bluetooth-init ${D}${sysconfdir}/init.d/bluetooth-init
+	install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/bluetooth/
 }
 
 PACKAGES =+ "${PN}-init"
 
+FILES_${PN} += " ${sysconfdir}/bluetooth/main.conf"
 FILES_${PN}-init = "${sysconfdir}/init.d/bluetooth-init"
 
 INITSCRIPT_PACKAGES += "${PN}-init"