diff options
Diffstat (limited to 'bcm4329')
| -rw-r--r-- | bcm4329/config/Android.mk | 21 | ||||
| -rw-r--r-- | bcm4329/config/wpa_supplicant.conf | 6 | ||||
| -rw-r--r-- | bcm4329/firmware/Android.mk | 4 | ||||
| -rw-r--r-- | bcm4329/firmware/fw_bcm4329_abg.bin | bin | 0 -> 269595 bytes |
4 files changed, 14 insertions, 17 deletions
diff --git a/bcm4329/config/Android.mk b/bcm4329/config/Android.mk index 508a96f..9597016 100644 --- a/bcm4329/config/Android.mk +++ b/bcm4329/config/Android.mk @@ -18,16 +18,6 @@ LOCAL_PATH := $(call my-dir) ######################## include $(CLEAR_VARS) -LOCAL_MODULE := wpa_supplicant.conf -LOCAL_MODULE_TAGS := user -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) - -######################## - -include $(CLEAR_VARS) LOCAL_MODULE := dhcpcd.conf LOCAL_MODULE_TAGS := user LOCAL_MODULE_CLASS := ETC @@ -35,4 +25,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/dhcpcd LOCAL_SRC_FILES := android_dhcpcd.conf include $(BUILD_PREBUILT) -######################## +######################### + +WIFI_DRIVER_SOCKET_IFACE := eth0 +ifeq ($(strip $(WPA_SUPPLICANT_VERSION)),VER_0_6_X) + include external/wpa_supplicant_6/wpa_supplicant/wpa_supplicant_conf.mk +else + include external/wpa_supplicant/wpa_supplicant_conf.mk +endif + +####################### diff --git a/bcm4329/config/wpa_supplicant.conf b/bcm4329/config/wpa_supplicant.conf deleted file mode 100644 index b1be388..0000000 --- a/bcm4329/config/wpa_supplicant.conf +++ /dev/null @@ -1,6 +0,0 @@ -##### wpa_supplicant configuration file template ##### -update_config=1 -ctrl_interface=eth0 -eapol_version=1 -ap_scan=1 -fast_reauth=1 diff --git a/bcm4329/firmware/Android.mk b/bcm4329/firmware/Android.mk index a2c1a00..db9c3e8 100644 --- a/bcm4329/firmware/Android.mk +++ b/bcm4329/firmware/Android.mk @@ -22,7 +22,11 @@ LOCAL_MODULE := fw_bcm4329.bin LOCAL_MODULE_CLASS := ETC #LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/firmware LOCAL_MODULE_PATH := $(TARGET_OUT)/vendor/firmware +ifeq ($(strip $(WIFI_BAND)),802_11_ABG) +LOCAL_SRC_FILES := fw_bcm4329_abg.bin +else LOCAL_SRC_FILES := $(LOCAL_MODULE) +endif include $(BUILD_PREBUILT) ######################## diff --git a/bcm4329/firmware/fw_bcm4329_abg.bin b/bcm4329/firmware/fw_bcm4329_abg.bin Binary files differnew file mode 100644 index 0000000..c44f465 --- /dev/null +++ b/bcm4329/firmware/fw_bcm4329_abg.bin |