summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--core_amlogic.mk17
-rw-r--r--core_base_atv.mk64
-rw-r--r--init.amlogic.wifi_buildin.rc1
-rw-r--r--init.amlogic.wifi_buildin_ap62x8.rc1
-rw-r--r--patch/Readme.txt12
-rw-r--r--products/tv/init.amlogic.rc3
-rw-r--r--products/tv/product_tv.mk5
-rw-r--r--sepolicy/device.te3
-rw-r--r--sepolicy/file.te7
-rw-r--r--sepolicy/file_contexts22
-rw-r--r--sepolicy/hal_audio_default.te1
-rw-r--r--sepolicy/hal_graphics_composer_default.te4
-rw-r--r--sepolicy/hal_tv_input_default.te6
-rw-r--r--sepolicy/hwservice.te1
-rw-r--r--sepolicy/hwservice_contexts4
-rw-r--r--sepolicy/hwservicemanager.te5
-rw-r--r--sepolicy/mediacodec.te2
-rw-r--r--sepolicy/system_app.te8
-rw-r--r--sepolicy/system_control.te15
-rw-r--r--sepolicy/tvserver.te48
-rw-r--r--wifi.mk7
-rw-r--r--wifi_driver.mk8
-rw-r--r--wifi_modules.mk1
23 files changed, 207 insertions, 38 deletions
diff --git a/wifi.mk b/wifi.mk
index b1a8497..e468b81 100644
--- a/wifi.mk
+++ b/wifi.mk
@@ -66,7 +66,6 @@ PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6335/nvram.txt:$(TA
PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6212/fw_bcm43438a0.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm43438a0.bin
PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6212/nvram.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6212.txt
endif
-
################################################################################## bcm4354
ifeq ($(WIFI_MODULE),bcm4354)
WIFI_DRIVER := bcm4354
@@ -113,13 +112,11 @@ endif
################################################################################## bcm4356
ifeq ($(WIFI_MODULE),bcm4356)
WIFI_DRIVER := bcm4356
-
ifneq ($(WIFI_BUILD_IN), true)
WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
WIFI_DRIVER_MODULE_NAME := dhd
WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin nvram_path=/vendor/etc/wifi/4356/nvram_ap6356.txt"
endif
-
WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin
WIFI_DRIVER_FW_PATH_AP := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_apsta.bin
WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_p2p.bin
@@ -714,13 +711,11 @@ endif
################################################################################## AP6335
ifeq ($(WIFI_MODULE),AP6335)
WIFI_DRIVER := AP6335
-
ifneq ($(WIFI_BUILD_IN), true)
WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
WIFI_DRIVER_MODULE_NAME := dhd
WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin nvram_path=/vendor/etc/wifi/6335/nvram.txt"
endif
-
WIFI_DRIVER_FW_PATH_STA :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin
WIFI_DRIVER_FW_PATH_AP :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_apsta.bin
WIFI_DRIVER_FW_PATH_P2P :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_p2p.bin
@@ -896,13 +891,11 @@ endif
################################################################################## AP6255
ifeq ($(WIFI_MODULE),AP6255)
WIFI_DRIVER := AP6255
-
ifneq ($(WIFI_BUILD_IN), true)
WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
WIFI_DRIVER_MODULE_NAME := dhd
WIFI_DRIVER_MODULE_ARG := "firmware_path=/vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin nvram_path=/vendor/etc/wifi/6255/nvram.txt"
endif
-
WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin
WIFI_DRIVER_FW_PATH_AP := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_apsta.bin
WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_p2p.bin