author | bin.yang <bin.yang@amlogic.com> | 2019-05-01 06:37:31 (GMT) |
---|---|---|
committer | Xiaoliang Wang <xiaoliang.wang@amlogic.com> | 2019-05-14 09:49:32 (GMT) |
commit | d0409c42ce864802fa49bd8c92ae8bff0320a9e0 (patch) | |
tree | b727800034e89c845360738a67b9b6073dde839e | |
parent | 5430d69f44caacffb306b73748ae29793f61920e (diff) | |
download | common-d0409c42ce864802fa49bd8c92ae8bff0320a9e0.zip common-d0409c42ce864802fa49bd8c92ae8bff0320a9e0.tar.gz common-d0409c42ce864802fa49bd8c92ae8bff0320a9e0.tar.bz2 |
device/amlogic/common: optimize wifi/bluetooth configs [2/9]
PD#SWPL-6995
Problem:
1. btusb.ko is always loaded
2. all bt drivers are always compiled
Solution:
compile/copy/load only the driver that BLUETOOTH_MODULE set.
Verify:
fermi deadpool
Change-Id: I9895415cc577a95daf05ae690309526e98264ef0
Signed-off-by: bin.yang <bin.yang@amlogic.com>
-rwxr-xr-x | bluetooth.mk | 17 | ||||
-rwxr-xr-x | products/mbox/init.amlogic.system.rc | 3 | ||||
-rwxr-xr-x | products/tv/init.amlogic.system.rc | 3 | ||||
-rw-r--r-- | rtk_bt_driver.mk | 11 | ||||
-rwxr-xr-x | wifi.mk | 17 | ||||
-rwxr-xr-x | wifi_driver.mk | 4 | ||||
-rwxr-xr-x | wifi_modules.mk | 1 |
7 files changed, 0 insertions, 56 deletions
diff --git a/bluetooth.mk b/bluetooth.mk deleted file mode 100755 index d7c4d12..0000000 --- a/bluetooth.mk +++ b/dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include hardware/amlogic/wifi/configs/bluetooth.mk diff --git a/products/mbox/init.amlogic.system.rc b/products/mbox/init.amlogic.system.rc index d64982a..17143d3 100755 --- a/products/mbox/init.amlogic.system.rc +++ b/products/mbox/init.amlogic.system.rc @@ -84,9 +84,6 @@ on boot chown bluetooth bluetooth /proc/bluetooth/sleep/lpm chmod 0660 /proc/bluetooth/sleep/btwrite chmod 0660 /proc/bluetooth/sleep/lpm - # change back to bluetooth from system - insmod /vendor/lib/modules/btusb.ko - #mknod btusb0 c 180 194 can not use it from P,fixed in btusb driver chown system mediadrm /sys/class/amhdmitx/amhdmitx0/aud_ch diff --git a/products/tv/init.amlogic.system.rc b/products/tv/init.amlogic.system.rc index 0c8149e..fca2c0d 100755 --- a/products/tv/init.amlogic.system.rc +++ b/products/tv/init.amlogic.system.rc @@ -83,9 +83,6 @@ on boot chown bluetooth bluetooth /proc/bluetooth/sleep/lpm chmod 0660 /proc/bluetooth/sleep/btwrite chmod 0660 /proc/bluetooth/sleep/lpm - # change back to bluetooth from system - insmod /vendor/lib/modules/btusb.ko - #mknod btusb0 c 180 194 can not use it from P,fixed in btusb driver chown system mediadrm /sys/class/amhdmitx/amhdmitx0/aud_ch diff --git a/rtk_bt_driver.mk b/rtk_bt_driver.mk deleted file mode 100644 index 386511e..0000000 --- a/rtk_bt_driver.mk +++ b/dev/null @@ -1,11 +0,0 @@ -KERNEL_ARCH ?= arm64 -CROSS_COMPILE ?= aarch64-linux-gnu- -PRODUCT_OUT=out/target/product/$(TARGET_PRODUCT) -TARGET_OUT=$(PRODUCT_OUT)/obj/lib_vendor - -rtk_btusb: - @echo "make rtk bluetooth module KERNEL_ARCH is $(KERNEL_ARCH)" - $(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/realtek/bluetooth/rtk_btusb ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_BT_RTKBTUSB=m modules - mkdir -p $(TARGET_OUT)/ - cp $(shell pwd)/hardware/realtek/bluetooth/rtk_btusb/rtk_btusb.ko $(TARGET_OUT)/ - diff --git a/wifi.mk b/wifi.mk deleted file mode 100755 index 0c26509..0000000 --- a/wifi.mk +++ b/dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include hardware/amlogic/wifi/configs/wifi.mk diff --git a/wifi_driver.mk b/wifi_driver.mk deleted file mode 100755 index 2402208..0000000 --- a/wifi_driver.mk +++ b/dev/null @@ -1,4 +0,0 @@ -WIFI_MODULE ?= multiwifi - -multiwifi: - $(MAKE) WIFI_MODULE=$(WIFI_MODULE) -f hardware/amlogic/wifi/configs/wifi_driver.mk diff --git a/wifi_modules.mk b/wifi_modules.mk deleted file mode 100755 index 7c61e43..0000000 --- a/wifi_modules.mk +++ b/dev/null @@ -1 +0,0 @@ --include hardware/amlogic/wifi/configs/wifi_modules.mk |