summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Wang <leozwang@google.com>2016-02-25 21:46:36 +0000
committerLeo Wang <leozwang@google.com>2016-02-25 21:46:36 +0000
commit649c4c91a8f41e8987bb4a7deb22eae321d2ae1d (patch)
tree0f9318642f5a970d14eb466fa2463170bd96a46e
parent815ae5815f64a5852b3d66b94ef151ae936aaf94 (diff)
downloadpicoimx-649c4c91a8f41e8987bb4a7deb22eae321d2ae1d.tar.gz
Revert "Enable BCM4339 Bluetooth for Picoimx"
This reverts commit 815ae5815f64a5852b3d66b94ef151ae936aaf94. Change-Id: Iac12895558a4a38b6c3dce0cb47432d288e5bd9e
-rwxr-xr-xbase_product/picoimx.mk1
-rw-r--r--sepolicy/file_contexts3
-rw-r--r--ueventd.freescale.rc3
3 files changed, 1 insertions, 6 deletions
diff --git a/base_product/picoimx.mk b/base_product/picoimx.mk
index 0428242..e9f92b8 100755
--- a/base_product/picoimx.mk
+++ b/base_product/picoimx.mk
@@ -28,7 +28,6 @@ PRODUCT_DEVICE := picoimx
# Call vendor's peripheral mk.
include hardware/bsp/freescale/peripheral/wifi/bcm4339/peripheral.mk
-include hardware/bsp/freescale/peripheral/bluetooth/bcm4339/peripheral.mk
PRODUCT_PACKAGES += keystore.default
PRODUCT_PACKAGES += bootctrl.imx6ul
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index f247685..1c29f2e 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -8,6 +8,3 @@
/dev/block/mmcblk0p7 u:object_r:boot_block_device:s0
/dev/block/mmcblk0p5 u:object_r:system_block_device:s0
/dev/block/mmcblk0p8 u:object_r:system_block_device:s0
-/dev/ttymxc4 u:object_r:bluetoothtbd_device:s0
-/sys/devices/soc0/bt_rfkill.19/rfkill/rfkill0/state u:object_r:sysfs_bluetoothtbd_writable:s0
-/sys/devices/soc0/bt_rfkill.19/rfkill/rfkill0/type u:object_r:sysfs_bluetoothtbd_readable:s0
diff --git a/ueventd.freescale.rc b/ueventd.freescale.rc
index 237d7bf..967e40a 100644
--- a/ueventd.freescale.rc
+++ b/ueventd.freescale.rc
@@ -15,8 +15,7 @@
#
/dev/pmem_gpu 0660 system graphics
-/dev/ttymxc4 0660 bluetooth net_bt_stack
-/dev/rfkill 0660 bluetooth bluetooth
+/dev/ttymxc5 0660 bluetooth bluetooth
/dev/snd/* 0660 system audio
/dev/ttyUSB* 0640 radio radio
/dev/ttyACM* 0640 radio radio