| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-10-31 11:18:05 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-10-31 11:18:05 (GMT) |
| commit | 71058a6c61eaedf427fc9ca26a72cd88498b927d (patch) | |
| tree | 4a1ea59838d5a19d7ffb1df763990ade5a03091e | |
| parent | f557246b64bd7f1b26ff479ba01f660ff784dc49 (diff) | |
| parent | 9d16834d6eb65da78176f219c9764cf8ab04229b (diff) | |
| download | amlogic-o-71058a6c61eaedf427fc9ca26a72cd88498b927d.zip amlogic-o-71058a6c61eaedf427fc9ca26a72cd88498b927d.tar.gz amlogic-o-71058a6c61eaedf427fc9ca26a72cd88498b927d.tar.bz2 | |
Merge "multi wifi: add multi wifi for O [1/3]" into o-amlogic
| -rw-r--r-- | common/sepolicy/wificond.te | 2 | ||||
| -rw-r--r-- | common/wifi.mk | 3 | ||||
| -rw-r--r-- | p230/Kernel.mk | 2 | ||||
| -rw-r--r-- | p230/p230.mk | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/common/sepolicy/wificond.te b/common/sepolicy/wificond.te index 61a4f9c..9bf0d86 100644 --- a/common/sepolicy/wificond.te +++ b/common/sepolicy/wificond.te @@ -1 +1,3 @@ allow wificond kernel:system module_request; + +allow wificond vendor_file:file { read open getattr execute }; diff --git a/common/wifi.mk b/common/wifi.mk index 8a25591..caa8135 100644 --- a/common/wifi.mk +++ b/common/wifi.mk @@ -50,7 +50,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ wificond \ - wifilogd + wifilogd \ + libwifi-hal-common-ext ################################################################################## bcm4354 ifeq ($(WIFI_MODULE),bcm4354) diff --git a/p230/Kernel.mk b/p230/Kernel.mk index d344f85..9590bbc 100644 --- a/p230/Kernel.mk +++ b/p230/Kernel.mk @@ -5,7 +5,7 @@ USE_PREBUILT_KERNEL := false -WIFI_MODULE := bcm4356 +WIFI_MODULE := multiwifi INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel diff --git a/p230/p230.mk b/p230/p230.mk index d70abf9..859b92a 100644 --- a/p230/p230.mk +++ b/p230/p230.mk @@ -174,7 +174,8 @@ endif # ######################################################################### -WIFI_MODULE := bcm4356 +#WIFI_MODULE := bcm4356 +MULTI_WIFI_SUPPORT := true include device/amlogic/common/wifi.mk # Change this to match target country |