diff --git a/android/device/softwinner/common/BoardConfigCommon.mk b/android/device/softwinner/common/BoardConfigCommon.mk
index c1d4a39d39..1deefbcb02 100755
--- a/android/device/softwinner/common/BoardConfigCommon.mk
+++ b/android/device/softwinner/common/BoardConfigCommon.mk
@@ -14,14 +14,3 @@ TARGET_RECOVERY_FSTAB := device/softwinner/common/recovery.fstab
 BOARD_SEPOLICY_DIRS += device/softwinner/common/sepolicy/vendor
 BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/softwinner/common/sepolicy/public
 BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/softwinner/common/sepolicy/private
-
-# wifi and bt configuration
-# 1. Wifi Configuration
-BOARD_WIFI_VENDOR           := common
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-BOARD_HOSTAPD_DRIVER        := NL80211
-WPA_SUPPLICANT_VERSION      := VER_0_8_X
-BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_common
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_common
-include hardware/aw/wlan/firmware/firmware.mk
-
diff --git a/android/device/softwinner/common/init.common.rc b/android/device/softwinner/common/init.common.rc
index 9df73ff954..111508cfb5 100755
--- a/android/device/softwinner/common/init.common.rc
+++ b/android/device/softwinner/common/init.common.rc
@@ -15,34 +15,6 @@ service bugreport /system/bin/dumpstate -d -p -B -z \
     oneshot
     keycodes 114 115 116
 
-
 on property:sys.drop_cache=1
     write /proc/sys/vm/drop_caches 3
     setprop sys.drop_cache 0
-
-# broadcom wifi sta p2p concurrent service
-service wpa_supplicant_broadcom /system/vendor/bin/hw/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.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 \
-    -O/data/misc/wifi/sockets \
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
-# realtek & eagle wifi service
-service wpa_supplicant_realtek /system/vendor/bin/hw/wpa_supplicant \
-    -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
-    -I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
-    -e/data/misc/wifi/entropy.bin -N \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
-    -O/data/misc/wifi/sockets \
-    -g@android:wpa_wlan0
-    socket wpa_wlan0 dgram 660 wifi wifi
-    class main
-    disabled
-    oneshot
diff --git a/android/device/softwinner/common/init.wireless.broadcom.rc b/android/device/softwinner/common/init.wireless.broadcom.rc
index bc95eb7813..223ed3526f 100644
--- a/android/device/softwinner/common/init.wireless.broadcom.rc
+++ b/android/device/softwinner/common/init.wireless.broadcom.rc
@@ -1,6 +1,11 @@
 on boot
     #insmod /system/vendor/modules/bcmdhd.ko
-    insmod /system/vendor/modules/bcm_btlpm.ko
+    #insmod /system/vendor/modules/bcm_btlpm.ko
+
+    # Bluetooth
+    # UART device
+    chmod 0660 /dev/ttyS1
+    chown bluetooth net_bt_admin /dev/ttyS1
 
     # bluetooth power up/down interface
     chmod 0660 /sys/class/rfkill/rfkill0/state
@@ -26,30 +31,31 @@ on boot
 
 # broadcom wifi service
 # 1 broadcom wifi sta service
+# broadcom wifi sta p2p concurrent service
 service wpa_supplicant_broadcom /system/vendor/bin/hw/wpa_supplicant \
-   -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-   -m/data/misc/wifi/p2p_supplicant.conf \
-   -puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
-   -O/data/misc/wifi/sockets \
-   -e/data/misc/wifi/entropy.bin \
-   -g@android:wpa_wlan0
+    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.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 \
+    -O/data/misc/wifi/sockets \
     class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
 
 # 2 broadcom wifi sta p2p concurrent service
-service p2p_supplicant /system/vendor/bin/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
-    -puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
-    -O/data/misc/wifi/sockets \
-    -m/data/misc/wifi/p2p_supplicant.conf \
-    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
+#service p2p_supplicant /system/vendor/bin/wpa_supplicant \
+#    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+#    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
+#    -puse_p2p_group_interface=1p2p_device=1use_multi_chan_concurrent=1 \
+#    -O/data/misc/wifi/sockets \
+#    -m/data/misc/wifi/p2p_supplicant.conf \
+#    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
+#    class main
+#    socket wpa_wlan0 dgram 660 wifi wifi
+#    disabled
+#    oneshot
 
 # Run gps service
 #service gps-daemon /system/bin/glgps -c /system/etc/gps/gpsconfig.xml
diff --git a/android/device/softwinner/common/init.wireless.realtek.rc b/android/device/softwinner/common/init.wireless.realtek.rc
index 904def9ff8..4224c01bc2 100644
--- a/android/device/softwinner/common/init.wireless.realtek.rc
+++ b/android/device/softwinner/common/init.wireless.realtek.rc
@@ -1,6 +1,11 @@
 on boot
     insmod /system/vendor/modules/rtl_btlpm.ko
 
+    # Bluetooth
+    # UART device
+    chmod 0660 /dev/rtk_btusb
+    chown bluetooth net_bt_admin /dev/rtk_btusb
+
     # change back to bluetooth from system
     chown bluetooth net_bt_admin /data/misc/bluetooth
     mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
@@ -23,12 +28,30 @@ on boot
     chown bluetooth net_bt_admin /data/misc/bluetooth
     setprop ro.bt.bdaddr_path "/data/misc/bluetooth/bdaddr"
 
+    # MAC Program
+    mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
+    exec - root system -- /vendor/xbin/macprog.sh
+    chmod 775 /data/misc/wifi
 
     # to observe dnsmasq.leases file for dhcp information of soft ap.
     chown dhcp system /data/misc/dhcp
 
 # 1. realtek & eagle wifi service
-service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
+#service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
+#    -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
+#    -I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
+#    -e/data/misc/wifi/entropy.bin -N \
+#    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+#    -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \
+#    -O/data/misc/wifi/sockets \
+#    -g@android:wpa_wlan0
+#    socket wpa_wlan0 dgram 660 wifi wifi
+#    class main
+#    disabled
+#    oneshot
+
+# realtek & eagle wifi service
+service wpa_supplicant_realtek /system/vendor/bin/hw/wpa_supplicant \
     -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
     -I/vendor/etc/wifi/p2p_supplicant_overlay.conf \
     -e/data/misc/wifi/entropy.bin -N \
diff --git a/android/device/softwinner/tulip-common/init.sun50iw1p1.rc b/android/device/softwinner/tulip-common/init.sun50iw1p1.rc
index 6e7a15ade6..49d7004e6d 100755
--- a/android/device/softwinner/tulip-common/init.sun50iw1p1.rc
+++ b/android/device/softwinner/tulip-common/init.sun50iw1p1.rc
@@ -1,4 +1,5 @@
 import /vendor/etc/init/hw/init.common.rc
+import /vendor/etc/init/hw/init.wireless.rc
 import /vendor/etc/init/hw/init.device.rc
 import /vendor/etc/init/hw/init.sun50iw1p1.usb.rc
 
diff --git a/android/device/softwinner/tulip-m64-hdmi/BoardConfig.mk b/android/device/softwinner/tulip-m64-hdmi/BoardConfig.mk
index ecc6ac160b..1ef870539f 100755
--- a/android/device/softwinner/tulip-m64-hdmi/BoardConfig.mk
+++ b/android/device/softwinner/tulip-m64-hdmi/BoardConfig.mk
@@ -60,6 +60,7 @@ ifeq ($(BOARD_WIFI_VENDOR), broadcom)
     WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
 
     BOARD_USR_WIFI := ap6212
+    include hardware/aw/wlan/config/config.mk
     include hardware/aw/wlan/firmware/firmware.mk
 endif
 
diff --git a/android/device/softwinner/tulip-m64-hdmi/configs/init.wireless.rc b/android/device/softwinner/tulip-m64-hdmi/configs/init.wireless.rc
deleted file mode 100755
index 33cfff308f..0000000000
--- a/android/device/softwinner/tulip-m64-hdmi/configs/init.wireless.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-on boot
-    # MAC Program
-    mkdir /data/misc/bluedroid 0770 bluetooth net_bt_admin
-    exec - root system -- /vendor/xbin/macprog.sh
-    chmod 775 /data/misc/wifi
-
-    # Bluetooth
-    # UART device
-    chmod 0660 /dev/ttyS1
-    chown bluetooth net_bt_admin /dev/ttyS1
-
diff --git a/android/hardware/aw/wlan/config/config.mk b/android/hardware/aw/wlan/config/config.mk
index a5df05f4a8..8b07f92aff 100755
--- a/android/hardware/aw/wlan/config/config.mk
+++ b/android/hardware/aw/wlan/config/config.mk
@@ -17,9 +17,7 @@
 ########################
 PRODUCT_COPY_FILES += \
     hardware/aw/wlan/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-    hardware/aw/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf
+    hardware/aw/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+    $(TOP_DIR)device/softwinner/common/init.wireless.broadcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wireless.rc 
 ########################
 
-PRODUCT_COPY_FILES += \
-    $(TOP_DIR)device/softwinner/common/init.wireless.broadcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.broadcom.rc \
-    $(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/init.wireless.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.rc
diff --git a/android/hardware/aw/wlan/firmware/firmware.mk b/android/hardware/aw/wlan/firmware/firmware.mk
index 565f5b6f1d..9457591f27 100755
--- a/android/hardware/aw/wlan/firmware/firmware.mk
+++ b/android/hardware/aw/wlan/firmware/firmware.mk
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-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
diff --git a/android/hardware/realtek/bluetooth/libbt-vendor/src/userial_vendor.c b/android/hardware/realtek/bluetooth/libbt-vendor/src/userial_vendor.c
index 19315f13ed..4e50866ec7 100644
--- a/android/hardware/realtek/bluetooth/libbt-vendor/src/userial_vendor.c
+++ b/android/hardware/realtek/bluetooth/libbt-vendor/src/userial_vendor.c
@@ -272,7 +272,7 @@ void userial_ioctl_init_bt_wake(int fd)
 void userial_vendor_init(char *bt_device_node)
 {
     vnd_userial.fd = -1;
-    char value[100];
+    char value[PROPERTY_VALUE_MAX];
     snprintf(vnd_userial.port_name, VND_PORT_NAME_MAXLEN, "%s", \
             bt_device_node);
     if(rtkbt_transtype & RTKBT_TRANS_H5) {
diff --git a/android/hardware/realtek/wlan/config/config.mk b/android/hardware/realtek/wlan/config/config.mk
index 47335598ce..b6554708c4 100644
--- a/android/hardware/realtek/wlan/config/config.mk
+++ b/android/hardware/realtek/wlan/config/config.mk
@@ -18,10 +18,7 @@ PRODUCT_COPY_FILES += \
     hardware/realtek/wlan/config/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
     hardware/realtek/wlan/config/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     hardware/realtek/wlan/config/macprog.sh:$(TARGET_COPY_OUT_VENDOR)/xbin/macprog.sh \
-    device/softwinner/common/init.wireless.realtek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.realtek.rc
-
-PRODUCT_COPY_FILES += \
-    $(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/init.wireless.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wireless.rc
+    device/softwinner/common/init.wireless.realtek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.wireless.rc
 
 PRODUCT_COPY_FILES += \
     $(call find-copy-subdir-files,"wifi_efuse_*.map",$(TOP_DIR)device/softwinner/$(basename $(TARGET_DEVICE))/configs/,$(TARGET_COPY_OUT_VENDOR)/etc/wifi)