| -rw-r--r-- | init.amlogic.wifi_bcm.rc | 7 | ||||
| -rw-r--r-- | init.amlogic.wifi_buildin.rc | 3 | ||||
| -rw-r--r-- | init.amlogic.wifi_buildin_ap62x8.rc | 4 | ||||
| -rw-r--r-- | products/mbox/init.amlogic.rc | 1 | ||||
| -rw-r--r-- | products/tv/init.amlogic.rc | 1 | ||||
| -rw-r--r-- | wifi.mk | 100 |
6 files changed, 105 insertions, 11 deletions
@@ -53,6 +53,20 @@ PRODUCT_PACKAGES += \ wifilogd \ libwifi-hal-common-ext +################################################################################## buildin +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6255/fw_bcm43455c0_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm43455c0_ag.bin +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6255/nvram.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6255.txt +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/4356/fw_bcm4356a2_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm4356a2_ag.bin +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/4356/nvram_ap6356.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6356.txt +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/buildin/config.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/config.txt +PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6335/fw_bcm4339a0_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm4339a0_ag.bin +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6335/nvram.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6335.txt +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 @@ -109,15 +123,18 @@ 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 - +ifneq ($(WIFI_BUILD_IN), true) +BOARD_WLAN_DEVICE := bcmdhd +else BOARD_WLAN_DEVICE := MediaTek +endif WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd_ampak BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd_ampak PRODUCT_PACKAGES += \ 4356/nvram_ap6356.txt \ @@ -129,7 +146,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml - +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc +endif PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc PRODUCT_COPY_FILES += hardware/amlogic/wifi/multi_wifi/config/wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf @@ -269,7 +288,53 @@ PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 endif +################################################################################## AP62x8 +ifeq ($(WIFI_MODULE),AP62x8) +WIFI_DRIVER := AP62x8 +ifneq ($(WIFI_BUILD_IN), true) +WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/bcmdhd.ko +WIFI_DRIVER_MODULE_NAME := bcmdhd +WIFI_DRIVER_MODULE_ARG := "" +endif +WIFI_DRIVER_FW_PATH_STA := /vendor/etc/firmware/fw_bcmdhd.bin.trx +WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/firmware/fw_bcmdhd_p2p.bin.trx +WIFI_DRIVER_FW_PATH_AP := /vendor/etc/firmware/fw_bcmdhd_apsta.bin.trx +BCM_USB_WIFI := true + +ifneq ($(WIFI_BUILD_IN), true) +BOARD_WLAN_DEVICE := bcmdhd +else +BOARD_WLAN_DEVICE := MediaTek +endif +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" + +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd_ampak +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd_ampak +PRODUCT_PACKAGES += \ + wl \ + p2p_supplicant_overlay.conf \ + dhd \ + bcmdl + +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_buildin_ap62x8.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc +endif + +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/AP62x8/fw_bcm4358u_ag.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/43569/fw_bcm43569a2_ag.bin.trx +PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/AP62x8/nvram_ap62x8m.nvm:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/43569/nvram_ap6269a2.nvm + + +PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml + +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc + +PRODUCT_PROPERTY_OVERRIDES += \ + wifi.interface=wlan0 +endif ################################################################################## AP6242 ifeq ($(WIFI_MODULE),AP6242) WIFI_DRIVER := AP6242 @@ -660,7 +725,11 @@ 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 +ifneq ($(WIFI_BUILD_IN), true) BOARD_WLAN_DEVICE := bcmdhd +else +BOARD_WLAN_DEVICE := MediaTek +endif LIB_WIFI_HAL := libwifi-hal-bcm WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" @@ -683,7 +752,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml - +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc +endif PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) @@ -778,14 +849,20 @@ endif ################################################################################## AP6212 ifeq ($(WIFI_MODULE),AP6212) WIFI_DRIVER := AP6212 +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/6212/fw_bcm43438a0.bin nvram_path=/vendor/etc/wifi/6212/nvram.txt" +endif WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/6212/fw_bcm43438a0.bin WIFI_DRIVER_FW_PATH_AP := /vendor/etc/wifi/6212/fw_bcm43438a0_apsta.bin WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/6212/fw_bcm43438a0_p2p.bin +ifneq ($(WIFI_BUILD_IN), true) BOARD_WLAN_DEVICE := bcmdhd +else +BOARD_WLAN_DEVICE := MediaTek +endif WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" WPA_SUPPLICANT_VERSION := VER_0_8_X @@ -803,7 +880,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml - +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc +endif PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) @@ -828,7 +907,12 @@ 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 +ifneq ($(WIFI_BUILD_IN), true) BOARD_WLAN_DEVICE := bcmdhd +else +BOARD_WLAN_DEVICE := MediaTek +endif + WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" WPA_SUPPLICANT_VERSION := VER_0_8_X @@ -846,7 +930,9 @@ PRODUCT_PACKAGES += \ dhd PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml - +ifeq ($(WIFI_BUILD_IN), true) +PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc +endif PRODUCT_COPY_FILES += device/amlogic/common/init.amlogic.wifi_bcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc ifneq ($(wildcard $(TARGET_PRODUCT_DIR)/dhd.ko),) |