diff --git a/android/device/softwinner/common/init.common.rc b/android/device/softwinner/common/init.common.rc
index f37135256d..9df73ff954 100755
--- a/android/device/softwinner/common/init.common.rc
+++ b/android/device/softwinner/common/init.common.rc
@@ -21,13 +21,13 @@ on property:sys.drop_cache=1
     setprop sys.drop_cache 0
 
 # broadcom wifi sta p2p concurrent service
-service wpa_supplicant_broadcom /vendor/bin/hw/wpa_supplicant \
+service wpa_supplicant_broadcom /system/vendor/bin/hw/wpa_supplicant \
     -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
+    -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
     -puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
     -m/data/misc/wifi/p2p_supplicant.conf \
     -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 \
-    p2p_supported=true
+    -O/data/misc/wifi/sockets \
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
diff --git a/android/device/softwinner/tulip-m64/BoardConfig.mk b/android/device/softwinner/tulip-m64/BoardConfig.mk
index 0edfb93d80..98652a9123 100755
--- a/android/device/softwinner/tulip-m64/BoardConfig.mk
+++ b/android/device/softwinner/tulip-m64/BoardConfig.mk
@@ -46,7 +46,7 @@ DEVICE_MATRIX_FILE := device/softwinner/tulip-m64/configs/compatibility_matrix.x
 # wifi and bt configuration
 # 1. Wifi Configuration
 
-BOARD_WIFI_VENDOR := realtek
+BOARD_WIFI_VENDOR := broadcom
 
 # 1.1 broadcom wifi configuration
 # BOARD_USR_WIFI: ap6181/ap6210/ap6212/ap6330/ap6335
@@ -59,8 +59,8 @@ ifeq ($(BOARD_WIFI_VENDOR), broadcom)
     BOARD_WLAN_DEVICE           := bcmdhd
     WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
 
-    BOARD_USR_WIFI := ap6255
-    include hardware/broadcom/wlan/bcmdhd/firmware/$(BOARD_USR_WIFI)/device-bcm.mk
+    BOARD_USR_WIFI := ap6212
+    include hardware/aw/wlan/firmware/firmware.mk
 endif
 
 # 1.2 realtek wifi configuration
diff --git a/android/hardware/aw/wlan/Android.mk b/android/hardware/aw/wlan/Android.mk
index 689d1a1552..075a60a0b1 100755
--- a/android/hardware/aw/wlan/Android.mk
+++ b/android/hardware/aw/wlan/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(BOARD_WIFI_VENDOR), common)
+ifeq ($(BOARD_WIFI_VENDOR), broadcom)
 	include $(call all-subdir-makefiles)
 endif
diff --git a/android/hardware/aw/wlan/config/p2p_supplicant_overlay.conf b/android/hardware/aw/wlan/config/p2p_supplicant_overlay.conf
index 40c409bd6d..e44c47756e 100755
--- a/android/hardware/aw/wlan/config/p2p_supplicant_overlay.conf
+++ b/android/hardware/aw/wlan/config/p2p_supplicant_overlay.conf
@@ -1 +1,5 @@
+disable_scan_offload=1
 wowlan_triggers=any
+p2p_no_go_freq=5170-5740
+p2p_search_delay=0
+no_ctrl_interface=
\ No newline at end of file
diff --git a/android/hardware/aw/wlan/config/wpa_supplicant_overlay.conf b/android/hardware/aw/wlan/config/wpa_supplicant_overlay.conf
index 40c409bd6d..f0f6c1c861 100755
--- a/android/hardware/aw/wlan/config/wpa_supplicant_overlay.conf
+++ b/android/hardware/aw/wlan/config/wpa_supplicant_overlay.conf
@@ -1 +1,5 @@
+disable_scan_offload=1
 wowlan_triggers=any
+p2p_disabled=1
+filter_rssi=-75
+no_ctrl_interface=
diff --git a/android/hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a1.hcd b/android/hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a1.hcd
new file mode 100755
index 0000000000..c4a4b5510f
Binary files /dev/null and b/android/hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a1.hcd differ
diff --git a/android/hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk b/android/hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk
index 954af408ec..c49bc214ce 100755
--- a/android/hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk
+++ b/android/hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk
@@ -16,8 +16,12 @@
 
 PRODUCT_COPY_FILES += \
     hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a0.bin:vendor/modules/fw_bcm43438a0.bin \
+    hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1.bin:vendor/modules/fw_bcm43438a1.bin \
     hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a0_apsta.bin:vendor/modules/fw_bcm43438a0_apsta.bin \
+    hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_apsta.bin:vendor/modules/fw_bcm43438a1_apsta.bin \
     hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a0_p2p.bin:vendor/modules/fw_bcm43438a0_p2p.bin \
+    hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_p2p.bin:vendor/modules/fw_bcm43438a1_p2p.bin \
     hardware/aw/wlan/firmware/broadcom/ap6212/nvram_ap6212.txt:vendor/modules/nvram_ap6212.txt \
-    hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a0.hcd:vendor/modules/ap6212.hcd \
+    hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a0.hcd:vendor/modules/bcm43438a0.hcd \
+    hardware/aw/wlan/firmware/broadcom/ap6212/bcm43438a0.hcd:vendor/modules/bcm43438a1.hcd \
     hardware/aw/wlan/firmware/broadcom/ap6212/config.txt:vendor/modules/config_ap6212.txt
diff --git a/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1.bin b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1.bin
new file mode 100755
index 0000000000..8ee72cfc7d
Binary files /dev/null and b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1.bin differ
diff --git a/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_apsta.bin b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_apsta.bin
new file mode 100755
index 0000000000..8ee72cfc7d
Binary files /dev/null and b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_apsta.bin differ
diff --git a/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_p2p.bin b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_p2p.bin
new file mode 100755
index 0000000000..e815f4402a
Binary files /dev/null and b/android/hardware/aw/wlan/firmware/broadcom/ap6212/fw_bcm43438a1_p2p.bin differ
diff --git a/android/hardware/aw/wlan/firmware/firmware.mk b/android/hardware/aw/wlan/firmware/firmware.mk
index e69f5e4b08..565f5b6f1d 100755
--- a/android/hardware/aw/wlan/firmware/firmware.mk
+++ b/android/hardware/aw/wlan/firmware/firmware.mk
@@ -16,9 +16,9 @@
 
 include hardware/aw/wlan/config/config.mk
 include hardware/aw/wlan/firmware/broadcom/ap6212/device-bcm.mk
-include hardware/aw/wlan/firmware/broadcom/ap6356s/device-bcm.mk
-include hardware/aw/wlan/firmware/broadcom/ap6255/device-bcm.mk
-include hardware/aw/wlan/firmware/broadcom/ap6210/device-bcm.mk
-include hardware/aw/wlan/firmware/broadcom/ap6330/device-bcm.mk
-include hardware/aw/wlan/firmware/broadcom/ap6335/device-bcm.mk
+#include hardware/aw/wlan/firmware/broadcom/ap6356s/device-bcm.mk
+#include hardware/aw/wlan/firmware/broadcom/ap6255/device-bcm.mk
+#include hardware/aw/wlan/firmware/broadcom/ap6210/device-bcm.mk
+#include hardware/aw/wlan/firmware/broadcom/ap6330/device-bcm.mk
+#include hardware/aw/wlan/firmware/broadcom/ap6335/device-bcm.mk
 
diff --git a/android/hardware/aw/wlan/wpa_supplicant_8_lib/Android.mk b/android/hardware/aw/wlan/wpa_supplicant_8_lib/Android.mk
index f5fa8ea3ac..c1d3c34c13 100755
--- a/android/hardware/aw/wlan/wpa_supplicant_8_lib/Android.mk
+++ b/android/hardware/aw/wlan/wpa_supplicant_8_lib/Android.mk
@@ -63,7 +63,7 @@ endif
 ########################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := lib_driver_cmd_common
+LOCAL_MODULE := lib_driver_cmd_bcmdhd
 LOCAL_SHARED_LIBRARIES := libc libcutils
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_SRC_FILES := $(WPA_SRC_FILE)
diff --git a/android/hardware/broadcom/wlan/bcmdhd/Android.mk b/android/hardware/broadcom/wlan/bcmdhd/Android.mk
index 5b4312889d..a6b42c808f 100644
--- a/android/hardware/broadcom/wlan/bcmdhd/Android.mk
+++ b/android/hardware/broadcom/wlan/bcmdhd/Android.mk
@@ -1,3 +1,3 @@
-ifeq ($(BOARD_WLAN_DEVICE),bcmdhd)
+ifeq ($(BOARD_WLAN_DEVICE),common)
     include $(call all-subdir-makefiles)
 endif