summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@codeaurora.org>2012-08-14 07:39:39 -0700
committerIliyan Malchev <malchev@google.com>2012-08-19 15:48:54 -0700
commit4d299b079b847177a07dc0ea5695b1c3449ec8bf (patch)
treef7628915c8c8d2de83f19e503b715d872df62092
parent0e5306af36e587d441a3b5d5cc68c07b24f41610 (diff)
downloadmako-4d299b079b847177a07dc0ea5695b1c3449ec8bf.tar.gz
mako: Switch WLAN to wpa_supplicant_8
Change-Id: Ia61c41d6f600925637e92d013a5a6c3ebbfb6d4d
-rw-r--r--BoardConfig.mk11
-rw-r--r--CleanSpec.mk3
2 files changed, 6 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index e7c25d0..351c0f0 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -44,20 +44,17 @@ TARGET_BOOTLOADER_BOARD_NAME := MAKO
TARGET_BOOTLOADER_NAME=mako
TARGET_BOARD_INFO_FILE := device/lge/mako/board-info.txt
-# FIXME: HOSTAPD-derived wifi driver
BOARD_HAS_QCOM_WLAN := true
+BOARD_WLAN_DEVICE := qcwcn
+WPA_SUPPLICANT_VERSION := VER_0_8_X
BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
BOARD_HOSTAPD_DRIVER := NL80211
-WPA_SUPPLICANT_VERSION := VER_2_0_DEV
-HOSTAPD_VERSION := VER_2_0_DEV
+BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE)
WIFI_DRIVER_FW_PATH_STA := "sta"
WIFI_DRIVER_FW_PATH_AP := "ap"
-#WIFI_DRIVER_FW_PATH_P2P := "p2p"
WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/wlan.ko"
WIFI_DRIVER_MODULE_NAME := "wlan"
-WIFI_DRIVER_CONF_FILE := "/data/misc/wifi/WCNSS_qcom_cfg.ini"
-WIFI_DRIVER_DEF_CONF_FILE := $(WIFI_DRIVER_CONF_FILE)
-BOARD_WLAN_DEVICE := qcwcn
BOARD_EGL_CFG := device/lge/mako/egl.cfg
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c71acad..9e24093 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,5 +46,6 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/vold.fstab)
$(call add-clean-step, find $(OUT_DIR) -name "lights.msm8960*" -print0 | xargs -0 rm -f)
$(call add-clean-step, find $(OUT_DIR) -name "*.default.*so" -print0 | xargs -0 rm -f)
-
$(call add-clean-step, find $(PRODUCT_OUT) -name "*.prop" -print0 | xargs -0 rm -f)
+
+$(call add-clean-step, find $(OUT_DIR) -name "wpa_supplicant*" -print0 | xargs -0 rm -f)