Revert "Download BT firmware on the booting time"

This reverts commit 898ce717458c140ff0d086b33de14d3a8ae5e57e.

Change-Id: Ibc18f7a0e3c2a71dce4d270857b601f25825dae3

diff --git a/packaging/bluetooth-firmware-marvell.spec b/packaging/bluetooth-firmware-marvell.spec
index 722be7f5984f8d5b90ed368b79f248afb9bc4a5a..0eee6b5c6fd46f857b52f0a0906c4628817b3d56 100644 (file)
--- a/packaging/bluetooth-firmware-marvell.spec
+++ b/packaging/bluetooth-firmware-marvell.spec
@@ -36,10 +36,14 @@ rm -rf %{buildroot}
 %make_install
 
 install -D -m 0644 packaging/bt-driver-insmod.service %{buildroot}%{_libdir}/systemd/system/bt-driver-insmod.service
+install -D -m 0644 packaging/bt-driver-insmod.path %{buildroot}%{_libdir}/systemd/system/bt-driver-insmod.path
 
 %post artik530
+mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
 mkdir -p %{_libdir}/systemd/system/multi-user.target.wants/
-ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_libdir}/systemd/system/multi-user.target.wants/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.path %{_libdir}/systemd/system/multi-user.target.wants/
 
 %files
 %manifest %{name}.manifest
@@ -53,3 +57,4 @@ ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_libdir}/systemd/sys
 %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start.sh
 %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-set-addr.sh
 %{_libdir}/systemd/system/bt-driver-insmod.service
+%{_libdir}/systemd/system/bt-driver-insmod.path

diff --git a/packaging/bt-driver-insmod.path b/packaging/bt-driver-insmod.path
new file mode 100644 (file)
index 0000000..2418979
--- /dev/null
+++ b/packaging/bt-driver-insmod.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Path activation for the bt-driver-insmod
+
+[Path]
+PathExists=/run/.bt_driver_insmod

diff --git a/packaging/bt-driver-insmod.service b/packaging/bt-driver-insmod.service
index 5c1556042ebc8d4a62d25a2043fc5ea9e25b2e64..ba2d5d6cf4d675d4da9050220d886068724c4bbd 100644 (file)
--- a/packaging/bt-driver-insmod.service
+++ b/packaging/bt-driver-insmod.service
@@ -5,7 +5,6 @@ Description=Bluetooth driver insmod
 Type=oneshot
 ExecStartPre=/bin/sh -c "/bin/systemctl set-environment BT_KERNEL_DIR=$(uname -a | cut -d' ' -f3); /bin/systemctl set-environment BT_DRIVER_PRE=/usr/lib/modules/; /bin/systemctl set-environment BT_DRIVER_APPEND=/kernel/drivers/net/wireless/sd8977/mbt_src/bt8xxx.ko;"
 ExecStart=/usr/sbin/insmod ${BT_DRIVER_PRE}/${BT_KERNEL_DIR}/${BT_DRIVER_APPEND}
-ExecStartPost=/usr/bin/sh -c "/bin/echo 2 > /sys/devices/platform/sd8x-rfkill/pwr_ctrl"
 
 [Install]
 WantedBy=multi-user.target