diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-26 14:00:23 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-01-26 14:44:52 -0800 |
| commit | 14d7e18dcdd5a4b0845134cefb40ff320f9fb197 (patch) | |
| tree | 6ac028daf90530d7654ae4f701df67a0ad56919e | |
| parent | 54979c085de26e1bb63e71422c2153417fd39007 (diff) | |
| download | device_samsung_crespo-14d7e18dcdd5a4b0845134cefb40ff320f9fb197.zip device_samsung_crespo-14d7e18dcdd5a4b0845134cefb40ff320f9fb197.tar.gz device_samsung_crespo-14d7e18dcdd5a4b0845134cefb40ff320f9fb197.tar.bz2 | |
wlan: Switch to CFG80211
49447e2 ARM: herring: Switch to built-in CFG80211 wlan driver
Change-Id: Id6d7656e84c74711a7e59fb4c7d5e5b703db59a0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rwxr-xr-x | BoardConfigCommon.mk | 20 | ||||
| -rw-r--r-- | bcm4329.ko | bin | 277090 -> 0 bytes | |||
| -rw-r--r-- | device_base.mk | 6 | ||||
| -rwxr-xr-x | init.herring.rc | 2 | ||||
| -rw-r--r-- | kernel | bin | 3351432 -> 3547604 bytes |
5 files changed, 15 insertions, 13 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 61d04a4..2a04ec7 100755 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -66,14 +66,16 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 1073741824 BOARD_FLASH_BLOCK_SIZE := 4096 # Connectivity - Wi-Fi -WPA_SUPPLICANT_VERSION := VER_0_8_X -BOARD_WPA_SUPPLICANT_DRIVER := WEXT -BOARD_WLAN_DEVICE := bcm4329 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_wext -WIFI_DRIVER_MODULE_PATH := "/system/modules/bcm4329.ko" -WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcm4329.bin" -WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcm4329_apsta.bin" -WIFI_DRIVER_MODULE_NAME := "bcm4329" -WIFI_DRIVER_MODULE_ARG := "iface_name=wlan0 firmware_path=/vendor/firmware/fw_bcm4329.bin nvram_path=/vendor/firmware/nvram_net.txt" +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd +BOARD_WLAN_DEVICE := bcmdhd +#WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcm4329.ko" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" +WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" +WIFI_DRIVER_FW_PATH_AP := "/vendor/firmware/fw_bcmdhd_apsta.bin" +WIFI_DRIVER_FW_PATH_P2P := "/vendor/firmware/fw_bcmdhd_p2p.bin" USE_OPENGL_RENDERER := true diff --git a/bcm4329.ko b/bcm4329.ko Binary files differdeleted file mode 100644 index 86ed78c..0000000 --- a/bcm4329.ko +++ /dev/null diff --git a/device_base.mk b/device_base.mk index 8ea8e0d..9e05614 100644 --- a/device_base.mk +++ b/device_base.mk @@ -214,9 +214,6 @@ else LOCAL_WIFI_MODULE := $(TARGET_PREBUILT_WIFI_MODULE) endif -PRODUCT_COPY_FILES += \ - $(LOCAL_WIFI_MODULE):system/modules/bcm4329.ko - ifeq ($(TARGET_PREBUILT_KERNEL),) LOCAL_KERNEL := device/samsung/crespo/kernel else @@ -227,3 +224,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk) + +WIFI_BAND := 802_11_BG +$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk) diff --git a/init.herring.rc b/init.herring.rc index 45ae2d2..b10fbb3 100755 --- a/init.herring.rc +++ b/init.herring.rc @@ -96,7 +96,7 @@ service pvrsrvinit /system/vendor/bin/pvrsrvinit group root oneshot -service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 +service wpa_supplicant /system/bin/wpa_supplicant -Dnl80211 -iwlan0 class main socket wpa_wlan0 dgram 0660 wifi wifi disabled Binary files differ |