diff options
| -rw-r--r-- | BoardConfig.mk | 9 | ||||
| -rw-r--r-- | bcmdhd.ko | bin | 333138 -> 0 bytes | |||
| -rw-r--r-- | device.mk | 11 | ||||
| -rw-r--r-- | init.tuna.rc | 2 | ||||
| -rw-r--r-- | kernel | bin | 3326868 -> 3524576 bytes |
5 files changed, 10 insertions, 12 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8fed1a7..9cb6430 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -60,13 +60,14 @@ BOARD_FLASH_BLOCK_SIZE := 4096 #TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true # Wifi related defines -BOARD_WPA_SUPPLICANT_DRIVER := WEXT +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd BOARD_WLAN_DEVICE := bcmdhd -WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" -WIFI_DRIVER_FW_STA_PATH := "/vendor/firmware/fw_bcmdhd.bin" -WIFI_DRIVER_FW_AP_PATH := "/vendor/firmware/fw_bcmdhd_apsta.bin" +#WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" +WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" +WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/fw_bcmdhd.bin" +WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" WIFI_DRIVER_MODULE_ARG := "iface_name=wlan0 firmware_path=/system/vendor/firmware/fw_bcmdhd.bin nvram_path=/system/etc/wifi/bcmdhd.cal" WIFI_DRIVER_MODULE_NAME := "bcmdhd" diff --git a/bcmdhd.ko b/bcmdhd.ko Binary files differdeleted file mode 100644 index 6eaa9b2..0000000 --- a/bcmdhd.ko +++ /dev/null @@ -50,15 +50,12 @@ PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES += \ system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf -ifeq ($(TARGET_PREBUILT_WIFI_MODULE),) -LOCAL_WIFI_MODULE := device/samsung/tuna/bcmdhd.ko -else -LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) -endif - # Wifi +ifneq ($(TARGET_PREBUILT_WIFI_MODULE),) +PRODUCT_COPY_FILES += \ + $(TARGET_PREBUILT_WIFI_MODULE):system/lib/modules/bcmdhd.ko +endif PRODUCT_COPY_FILES += \ - $(LOCAL_WIFI_MODULE):system/lib/modules/bcmdhd.ko \ device/samsung/tuna/bcmdhd.cal:system/etc/wifi/bcmdhd.cal PRODUCT_PROPERTY_OVERRIDES := \ diff --git a/init.tuna.rc b/init.tuna.rc index e39fb58..aa231cb 100644 --- a/init.tuna.rc +++ b/init.tuna.rc @@ -92,7 +92,7 @@ service sdcard /system/bin/sdcard /data/media 1023 1023 class late_start service wpa_supplicant /system/bin/wpa_supplicant \ - -Dwext -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf + -Dnl80211 -iwlan0 -c/data/misc/wifi/wpa_supplicant.conf # we will start as root and wpa_supplicant will switch to user wifi # after setting up the capabilities required for WEXT # user wifi Binary files differ |