diff --git a/components/ble/CMakeLists.txt b/components/ble/CMakeLists.txt
index bea40d47..5d10a23c 100644
--- a/components/ble/CMakeLists.txt
+++ b/components/ble/CMakeLists.txt
@@ -145,14 +145,14 @@ endif()
 
 add_library(blecontroller STATIC IMPORTED)
 set_target_properties(blecontroller PROPERTIES
-IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/components/ble/blecontroller/lib/libblecontroller.a"
+IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/components/ble/blecontroller/lib/libblecontroller${LIBBLECONTROLLER_SUFFIX}.a"
 INTERFACE_LINK_LIBRARIES  ${CHIP}_driver)
 
 # aux_source_directory(src ADD_SRCS)
 #######################################################
 
 ########### Add required/dependent components #########
-list(APPEND ADD_REQUIREMENTS freertos blecontroller)
+list(APPEND ADD_REQUIREMENTS freertos blecontroller mbedtls)
 #######################################################
 
 ############ Add static libs ##########################
diff --git a/components/ble/bl702_rf/lib/libbl702_rf.a b/components/ble/bl702_rf/lib/libbl702_rf.a
index d3455ad2..eb99532e 100644
Binary files a/components/ble/bl702_rf/lib/libbl702_rf.a and b/components/ble/bl702_rf/lib/libbl702_rf.a differ
diff --git a/components/ble/ble_flags.cmake b/components/ble/ble_flags.cmake
index 6f8a7b5e..7bb1caeb 100644
--- a/components/ble/ble_flags.cmake
+++ b/components/ble/ble_flags.cmake
@@ -1,3 +1,80 @@
+if("${CONFIG_BLECONTROLLER_LIB}" STREQUAL "std")
+#set(CONFIG_BLE_TP_SERVER 1)
+endif()
+
+if("${CONFIG_BLECONTROLLER_LIB}" STREQUAL "m0s1")
+set(CONFIG_BT_CONN 1)
+set(CONFIG_BLE_TX_BUFF_DATA 2)
+set(CONFIG_BT_MESH 0)
+set(CONFIG_BT_ALLROLES 0)
+set(CONFIG_BT_CENTRAL 0)
+set(CONFIG_BT_PERIPHERAL 1)
+set(CONFIG_BT_OBSERVER 0)
+set(CONFIG_BT_BROADCASTER 0)
+set(CONFIG_DISABLE_BT_SMP 1)
+set(CONFIG_DISABLE_BT_HOST_PRIVACY 1)
+set(CONFIG_DISABLE_BT_ECC 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_PHY_UPDATE 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_TEST_MODE 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_SEC_CON 1)
+endif()
+
+if("${CONFIG_BLECONTROLLER_LIB}" STREQUAL "m0s1s")
+set(CONFIG_BT_CONN 1)
+set(CONFIG_BLE_TX_BUFF_DATA 2)
+set(CONFIG_BT_MESH 0)
+set(CONFIG_BT_ALLROLES 0)
+set(CONFIG_BT_CENTRAL 0)
+set(CONFIG_BT_PERIPHERAL 1)
+set(CONFIG_BT_OBSERVER 1)
+set(CONFIG_BT_BROADCASTER 0)
+set(CONFIG_DISABLE_BT_SMP 1)
+set(CONFIG_DISABLE_BT_HOST_PRIVACY 1)
+set(CONFIG_DISABLE_BT_ECC 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_PHY_UPDATE 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_TEST_MODE 1)
+set(CONFIG_DISABLE_BLE_CONTROLLER_SEC_CON 1)
+endif()
+
+if("${CONFIG_BLECONTROLLER_LIB}" STREQUAL "m0s1p")
+set(CONFIG_BT_CONN 1)
+set(CONFIG_BLE_TX_BUFF_DATA 2)
+set(CONFIG_BT_MESH 0)
+set(CONFIG_BT_ALLROLES 0)
+set(CONFIG_BT_CENTRAL 0)
+set(CONFIG_BT_PERIPHERAL 1)
+set(CONFIG_BT_OBSERVER 0)
+set(CONFIG_BT_BROADCASTER 0)
+set(CONFIG_DISABLE_BT_SMP 1)
+set(CONFIG_DISABLE_BT_HOST_PRIVACY 1)
+set(CFG_BLE_PDS 1)
+endif()
+
+if("${CONFIG_BLECONTROLLER_LIB}" STREQUAL "m16s1")
+set(CONFIG_BT_CONN 16)
+set(CONFIG_BT_ALLROLES 0)
+set(CONFIG_BT_CENTRAL 1)
+set(CONFIG_BT_PERIPHERAL 0)
+set(CONFIG_BT_OBSERVER 1)
+set(CONFIG_BT_BROADCASTER 0)
+set(CONFIG_BLE_STACK_DBG_PRINT 0)
+set(CONFIG_DISABLE_BT_SMP 1)
+set(CONFIG_BT_GATT_CLIENT 0)
+set(CONFIG_SIMPLE_MASTER 1)
+set(CONFIG_EM_16K 1)
+endif()
+
+
+if(CONFIG_BLECONTROLLER_LIB)
+if("${CHIP}" STREQUAL "bl602")
+set(LIBBLECONTROLLER_SUFFIX _602_${CONFIG_BLECONTROLLER_LIB})
+endif()
+if("${CHIP}" STREQUAL "bl702")
+set(LIBBLECONTROLLER_SUFFIX _702_${CONFIG_BLECONTROLLER_LIB})
+endif()
+endif()
+
+
 list(APPEND CFLAGS -DCFG_FREERTOS)
 list(APPEND CFLAGS -DARCH_RISCV)
 
@@ -21,7 +98,7 @@ list(APPEND CFLAGS -DCFG_BLE)
 list(APPEND CFLAGS -DCFG_SLEEP)
 list(APPEND CFLAGS -DOPTIMIZE_DATA_EVT_FLOW_FROM_CONTROLLER)
 
-if(NOT CONFIG_BT_BREDR)
+if(NOT DEFINED CONFIG_BT_BREDR)
 set(CONFIG_BT_BREDR 0)
 endif()
 
@@ -36,81 +113,85 @@ list(APPEND CFLAGS -DCONFIG_BT_TL)
 set(CONFIG_BLE_HOST_DISABLE 1)
 endif()
 
-if(NOT CONFIG_BT_CONN)
+if(NOT DEFINED CONFIG_BT_CONN)
 set(CONFIG_BT_CONN 2)
 endif()
 
+if(CONFIG_HW_SEC_ENG_DISABLE)
+list(APPEND CFLAGS -DCONFIG_HW_SEC_ENG_DISABLE)
+endif()
+
 list(APPEND CFLAGS -DBL_MCU_SDK)
 
 list(APPEND CFLAGS -DCFG_CON=${CONFIG_BT_CONN})
 
-if(NOT CONFIG_BLE_TX_BUFF_DATA)
+if(NOT DEFINED CONFIG_BLE_TX_BUFF_DATA)
 set(CONFIG_BLE_TX_BUFF_DATA ${CONFIG_BT_CONN})
 endif()
 
 list(APPEND CFLAGS -DCFG_BLE_TX_BUFF_DATA=${CONFIG_BLE_TX_BUFF_DATA})
 
-if(NOT CONFIG_BT_ALLROLES)
+if(NOT DEFINED CONFIG_BT_ALLROLES)
 set(CONFIG_BT_ALLROLES 1)
 endif()
 
-if(NOT CONFIG_BT_CENTRAL)
+if(NOT DEFINED CONFIG_BT_CENTRAL)
 set(CONFIG_BT_CENTRAL 1)
 endif()
 
-if(NOT CONFIG_BT_OBSERVER)
+if(NOT DEFINED CONFIG_BT_OBSERVER)
 set(CONFIG_BT_OBSERVER 1)
 endif()
 
-if(NOT CONFIG_BT_PERIPHERAL)
+if(NOT DEFINED CONFIG_BT_PERIPHERAL)
 set(CONFIG_BT_PERIPHERAL 1)
 endif()
 
-if(NOT CONFIG_BT_BROADCASTER)
+if(NOT DEFINED CONFIG_BT_BROADCASTER)
 set(CONFIG_BT_BROADCASTER 1)
 endif()
 
-if(NOT CONFIG_BT_SETTINGS)
+if(NOT DEFINED CONFIG_BT_SETTINGS)
 set(CONFIG_BT_SETTINGS 0)
 endif()
 
-if(NOT CONFIG_BLE_TP_SERVER)
+if(NOT DEFINED CONFIG_BLE_TP_SERVER)
 set(CONFIG_BLE_TP_SERVER 0)
 endif()
 
-if(NOT CONFIG_BLE_MULTI_ADV)
+if(NOT DEFINED CONFIG_BLE_MULTI_ADV)
 set(CONFIG_BLE_MULTI_ADV 0)
 endif()
 
-if(NOT CONFIG_BLE_STACK_DBG_PRINT)
+if(NOT DEFINED CONFIG_BLE_STACK_DBG_PRINT)
 set(CONFIG_BLE_STACK_DBG_PRINT 1)
 endif()
 
-if(NOT CONFIG_BT_STACK_PTS)
+if(NOT DEFINED CONFIG_BT_STACK_PTS)
 set(CONFIG_BT_STACK_PTS 0)
 endif()
 
-if(NOT CONFIG_BLE_TP_TEST)
+if(NOT DEFINED CONFIG_BLE_TP_TEST)
 set(CONFIG_BLE_TP_TEST 0)
 endif()
 
-if(NOT CONFIG_BT_GEN_RANDOM_BY_SW)
+if(NOT DEFINED CONFIG_BT_GEN_RANDOM_BY_SW)
 set(CONFIG_BT_GEN_RANDOM_BY_SW 0)
 endif()
 
-if(NOT CONFIG_DISABLE_BT_SMP)
+if(NOT DEFINED CONFIG_DISABLE_BT_SMP)
 set(CONFIG_DISABLE_BT_SMP 0)
 endif()
 
-if(NOT CONFIG_DISABLE_BT_HOST_PRIVACY)
+if(NOT DEFINED CONFIG_DISABLE_BT_HOST_PRIVACY)
 set(CONFIG_DISABLE_BT_HOST_PRIVACY 1)
 endif()
 
-if(NOT CFG_BLE_PDS)
+if(NOT DEFINED CFG_BLE_PDS)
 set(CFG_BLE_PDS 0)
 endif()
 
-if(NOT CONFIG_BT_OAD_SERVER)
+if(CONFIG_BT_OAD_SERVER)
 set(CONFIG_BT_OAD_SERVER 1)
 endif()
 
@@ -118,72 +199,78 @@ if(CONFIG_BT_OAD_SERVER)
 set(CONFIG_BL_MCU_SDK 1)
 endif()
 
-if(NOT CONFIG_BT_MESH)
+if(NOT DEFINED CONFIG_BT_MESH)
 set(CONFIG_BT_MESH 0)
 endif()
 
-if(NOT CONFIG_BT_MESH_MODEL)
+if(NOT DEFINED CONFIG_BT_MESH_MODEL)
 set(CONFIG_BT_MESH_MODEL 0)
 endif()
 
 if(CONFIG_BT_MESH)
 
-    if(NOT CONFIG_BT_MESH_PB_ADV)
+    if(NOT DEFINED CONFIG_BT_MESH_PB_ADV)
     set(CONFIG_BT_MESH_PB_ADV 1)
     endif()
 
-    if(NOT CONFIG_BT_MESH_PB_GATT)
+    if(NOT DEFINED CONFIG_BT_MESH_PB_GATT)
     set(CONFIG_BT_MESH_PB_GATT 1)
     endif()
 
-    if(NOT CONFIG_BT_MESH_FRIEND)
+    if(NOT DEFINED CONFIG_BT_MESH_FRIEND)
     set(CONFIG_BT_MESH_FRIEND 1)
     endif()
 
-    if(NOT CONFIG_BT_MESH_LOW_POWER)
+    if(NOT DEFINED CONFIG_BT_MESH_LOW_POWER)
     set(CONFIG_BT_MESH_LOW_POWER 1)
     endif()
 
-    if(NOT CONFIG_BT_MESH_PROXY)
+    if(NOT DEFINED CONFIG_BT_MESH_PROXY)
     set(CONFIG_BT_MESH_PROXY 1)
     endif()
 
-    if(NOT CONFIG_BT_MESH_GATT_PROXY)
+    if(NOT DEFINED CONFIG_BT_MESH_GATT_PROXY)
     set(CONFIG_BT_MESH_GATT_PROXY 1)
     endif()
 
     if(CONFIG_BT_MESH_MODEL)
-        if(NOT CONFIG_BT_MESH_MODEL_GEN_SRV)
+        if(NOT DEFINED CONFIG_BT_MESH_MODEL_GEN_SRV)
         set(CONFIG_BT_MESH_MODEL_GEN_SRV 1)
         endif()
-        if(NOT CONFIG_BT_MESH_MODEL_GEN_CLI)
+        if(NOT DEFINED CONFIG_BT_MESH_MODEL_GEN_CLI)
         set(CONFIG_BT_MESH_MODEL_GEN_CLI 1)
         endif()
-        if(NOT CONFIG_BT_MESH_MODEL_LIGHT_SRV)
+        if(NOT DEFINED CONFIG_BT_MESH_MODEL_LIGHT_SRV)
         set(CONFIG_BT_MESH_MODEL_LIGHT_SRV 1)
         endif()
-        if(NOT CONFIG_BT_MESH_MODEL_LIGHT_CLI)
+        if(NOT DEFINED CONFIG_BT_MESH_MODEL_LIGHT_CLI)
         set(CONFIG_BT_MESH_MODEL_LIGHT_CLI 1)
         endif()
     else()
-        if(NOT CONFIG_BT_MESH_MODEL_GEN_SRV)
+        if(NOT DEFINED CONFIG_BT_MESH_MODEL_GEN_SRV)
         set(CONFIG_BT_MESH_MODEL_GEN_SRV 1)
         endif()
     endif()
-
-    if(NOT CONFIG_BT_MESH_CDB)
-    set(CONFIG_BT_MESH_CDB 0)
-    endif()
-
-    if(NOT CONFIG_BT_MESH_PROVISIONER)
+    
+    if(NOT DEFINED CONFIG_BT_MESH_PROVISIONER)
     set(CONFIG_BT_MESH_PROVISIONER 0)
     endif()
 
-    if(NOT CONFIG_BT_MESH_SYNC)
+    if(CONFIG_BT_MESH_PROVISIONER)
+        if(NOT DEFINED CONFIG_BT_MESH_CDB)
+        set(CONFIG_BT_MESH_CDB 1)
+        endif()
+    else()
+        if(NOT DEFINED CONFIG_BT_MESH_CDB)
+        set(CONFIG_BT_MESH_CDB 0)
+        endif()
+    endif()
+
+    if(NOT DEFINED CONFIG_BT_MESH_SYNC)
     set(CONFIG_BT_MESH_SYNC 0)
     endif()
 
-    if(NOT CONFIG_BT_MESH_NODE_SEND_CFGCLI_MSG)
+    if(NOT DEFINED CONFIG_BT_MESH_NODE_SEND_CFGCLI_MSG)
     set(CONFIG_BT_MESH_NODE_SEND_CFGCLI_MSG 0)
     endif()
 endif()
diff --git a/components/ble/ble_stack/port/bl_port.c b/components/ble/ble_stack/port/bl_port.c
index 6976e33a..ccc1568d 100644
--- a/components/ble/ble_stack/port/bl_port.c
+++ b/components/ble/ble_stack/port/bl_port.c
@@ -15,6 +15,7 @@
 #include <task.h>
 #include <semphr.h>
 #include <timers.h>
+#include <stdlib.h>
 
 #if defined(BL_MCU_SDK)
 #define TRNG_LOOP_COUNTER (17)
@@ -25,13 +26,22 @@ int bl_rand();
 extern int bl_rand();
 #endif
 
+int ble_rand()
+{
+#if defined(CONFIG_HW_SEC_ENG_DISABLE)
+    extern long random(void);
+    return random();
+#else
+    return bl_rand();
+#endif
+}
+
 #if defined(BL_MCU_SDK)
 int bl_rand()
 {
     unsigned int val;
     int counter = 0;
     int32_t ret = 0;
-    Sec_Eng_Trng_Enable();
     do {
         ret = Sec_Eng_Trng_Get_Random((uint8_t *)&val, 4);
         if (ret < -1) {
@@ -359,7 +369,7 @@ void k_get_random_byte_array(uint8_t *buf, size_t len)
 {
     // bl_rand() return a word, but *buf may not be word-aligned
     for (int i = 0; i < len; i++) {
-        *(buf + i) = (uint8_t)(bl_rand() & 0xFF);
+        *(buf + i) = (uint8_t)(ble_rand() & 0xFF);
     }
 }
 
diff --git a/components/ble/ble_stack/services/oad/oad.h b/components/ble/ble_stack/services/oad/oad.h
index 0477044d..dc76e3b7 100644
--- a/components/ble/ble_stack/services/oad/oad.h
+++ b/components/ble/ble_stack/services/oad/oad.h
@@ -23,6 +23,7 @@ enum {
     OAD_REQ_MORE_DATA,
     OAD_MALORMED_CMD,
     OAD_UPGRD_CMPLT,
+    OAD_CHECK_HASH256_FAIL,
 };
 
 enum {
@@ -59,6 +60,8 @@ struct oad_env_tag {
     struct k_delayed_work upgrd_work;
     u32_t new_img_addr;
     u32_t w_img_end_addr;
+
+    u32_t hosal_offset;
 };
 
 struct oad_image_identity_t {
diff --git a/components/ble/ble_stack/services/oad/oad_main.c b/components/ble/ble_stack/services/oad/oad_main.c
index cf7d5272..d324eddb 100644
--- a/components/ble/ble_stack/services/oad/oad_main.c
+++ b/components/ble/ble_stack/services/oad/oad_main.c
@@ -13,16 +13,19 @@
 #include "hal_boot2.h"
 #include "bl_flash.h"
 #include "bl_sys.h"
+#include "hosal_ota.h"
+#include "bl702_common.h"
+#include "hal_sys.h"
 #else
 #include "partition.h"
 #include "hal_flash.h"
 #include "errno.h"
 #include "bl702_glb.h"
+#include "mbedtls/sha256.h"
 #endif
 #include "log.h"
 #include "bl702.h"
 #include "softcrc.h"
-
 #if defined(CONFIG_BL_MCU_SDK)
 #define BL_SDK_VER           "1.00"
 #define BOOT2_PARTITION_ADDR (0x4202DC00)
@@ -31,7 +34,6 @@
 #define OTA_WRITE_FLASH_SIZE (256 * 16)
 #define WBUF_SIZE(CON)       (OTA_WRITE_FLASH_SIZE + bt_gatt_get_mtu(CON))
 #define UPGRD_TIMEOUT        K_SECONDS(2)
-uint32_t calc_crc32_val = 0;
 
 static app_check_oad_cb app_check_cb = NULL;
 struct oad_env_tag oad_env;
@@ -47,6 +49,7 @@ static struct wflash_data_t wData;
 static int hal_boot2_partition_addr_inactive(const char *name, uint32_t *addr, uint32_t *size);
 static int hal_boot2_get_active_entries_byname(u8_t *name, pt_table_entry_config *ptEntry_hal);
 static int hal_boot2_update_ptable(pt_table_entry_config *ptEntry_hal);
+static int fw_check_hash256(void);
 #endif
 static bool check_data_valid(struct oad_file_info *file_info)
 {
@@ -116,23 +119,22 @@ static void oad_notify_block_req(struct bt_conn *conn)
     bt_oad_notify(conn, buf->data, buf->len);
 }
 
-static uint32_t oad_bswap32(uint32_t val32)
-{
-    return (val32 << 24) | ((val32 << 8) & 0xFF0000) | ((val32 >> 8) & 0xFF00) | ((val32 >> 24) & 0xFF);
-}
-
 static void oad_notify_upgrd_end(struct bt_conn *conn, u8_t status)
 {
     struct net_buf_simple *buf = NET_BUF_SIMPLE(sizeof(struct oad_upgrd_end_t) + OAD_OPCODE_SIZE);
     struct oad_upgrd_end_t *upgrd_end;
-    uint32_t recv_crc_bigend = 0;
+
     if (status == OAD_SUCC) {
-        recv_crc_bigend = oad_bswap32(oad_env.upgrd_crc32);
-        if (calc_crc32_val == recv_crc_bigend) {
-            BT_WARN("Submit upgrade work\r\n");
+        BT_WARN("Submit upgrade work\r\n");
+#if !defined(CONFIG_BL_MCU_SDK)
+        if (!hosal_ota_finish(1, 0))
+#else
+        if (!fw_check_hash256())
+#endif
             k_delayed_work_submit(&oad_env.upgrd_work, UPGRD_TIMEOUT);
-        } else {
-            BT_WARN("crc check failed, received crc=0x%x, calculted crc=0x%x, recv_crc_bigend=0x%x\r\n", oad_env.upgrd_crc32, calc_crc32_val, recv_crc_bigend);
+        else {
+            BT_WARN("Hash256 check failed");
+            status = OAD_CHECK_HASH256_FAIL;
         }
     }
 
@@ -165,43 +167,27 @@ static void oad_notity_image_identity(struct bt_conn *conn)
     bt_oad_notify(conn, buf->data, buf->len);
 }
 
-void oad_upgrade(struct k_work *work)
+void ota_finish(struct k_work *work)
 {
-    int ret = 0;
-#if !defined(CONFIG_BL_MCU_SDK)
-    HALPartition_Entry_Config ptEntry;
-#else
-    pt_table_entry_config ptEntry;
-#endif
-
     BT_WARN("oad_upgrade\r\n");
     oad_env.file_info.file_ver = oad_env.upgrd_file_ver;
-#if defined(CONFIG_BT_SETTINGS)
 
+#if defined(CONFIG_BT_SETTINGS)
     struct oad_ef_info ef_info;
     memset(&ef_info, 0, sizeof(struct oad_ef_info));
     bt_settings_set_bin(NV_IMG_info, (uint8_t *)&ef_info, sizeof(struct oad_ef_info));
-
 #endif
 
-    ret = hal_boot2_get_active_entries_byname((uint8_t *)"FW", &ptEntry);
-    if (ret) {
-        BT_WARN("Failed to get active entries by name\r\n");
-        return;
-    }
-
-    ptEntry.len = oad_env.upgrd_file_size;
-    hal_boot2_update_ptable(&ptEntry);
-
-#if !defined(CONFIG_BL_MCU_SDK)
-    bl_sys_reset_system();
-#else
+#if defined(CONFIG_BL_MCU_SDK)
     GLB_SW_System_Reset();
+#else
+    hal_reboot();
 #endif
 }
 
-static u8_t oad_write_flash(u8_t *data, u16_t len)
+static u8_t oad_write_flash(uint32_t filesize, uint32_t offset, u8_t *data, u16_t len)
 {
+#if defined(CONFIG_BL_MCU_SDK)
     uint32_t size = 0;
     uint32_t wflash_address = 0;
 
@@ -213,12 +199,8 @@ static u8_t oad_write_flash(u8_t *data, u16_t len)
 
         BT_WARN("Upgrade file size is %d\r\n", oad_env.upgrd_file_size);
         if (oad_env.upgrd_file_size <= size) {
-#if !defined(CONFIG_BL_MCU_SDK)
-            bl_flash_erase(oad_env.new_img_addr, oad_env.upgrd_file_size);
-#else
             BT_WARN("flash erase\r\n");
             flash_erase(oad_env.new_img_addr, oad_env.upgrd_file_size);
-#endif
         } else {
             return -1;
         }
@@ -235,15 +217,12 @@ static u8_t oad_write_flash(u8_t *data, u16_t len)
     }
 
     BT_WARN("Start address : 0x%x\r\n", wflash_address);
-#if !defined(CONFIG_BL_MCU_SDK)
-    bl_flash_write(wflash_address, data, len);
-#else
     flash_write(wflash_address, data, len);
-#endif
     oad_env.w_img_end_addr = wflash_address + len;
     BT_WARN("End address : 0x%x\r\n", wflash_address + len);
-
-    calc_crc32_val = BFLB_Soft_CRC32_Ex(calc_crc32_val, data, len);
+#else
+    hosal_ota_update(filesize, offset, data, len);
+#endif
 
     return 0;
 }
@@ -252,10 +231,8 @@ static u8_t oad_image_data_handler(struct bt_conn *conn, const u8_t *data, u16_t
 {
     u16_t left_size = 0;
     u16_t oDataLen = 0;
-
-#if defined(CONFIG_BT_SETTINGS)
     static u32_t write_count = 0;
-#endif
+
     if (!wData.wdata_buf) {
         wData.wdata_buf = (u8_t *)k_malloc(WBUF_SIZE(conn));
         if (!wData.wdata_buf) {
@@ -278,7 +255,7 @@ static u8_t oad_image_data_handler(struct bt_conn *conn, const u8_t *data, u16_t
             memcpy((wData.wdata_buf + wData.index), data, left_size);
             wData.index += left_size;
             if (wData.index == OTA_WRITE_FLASH_SIZE) {
-                if (oad_write_flash(wData.wdata_buf, OTA_WRITE_FLASH_SIZE)) {
+                if (oad_write_flash(oad_env.upgrd_file_size, oad_env.hosal_offset, wData.wdata_buf, OTA_WRITE_FLASH_SIZE)) {
                     BT_ERR("Failed to write flash\r\n");
                     return OAD_ABORT;
                 }
@@ -286,8 +263,10 @@ static u8_t oad_image_data_handler(struct bt_conn *conn, const u8_t *data, u16_t
                 BT_ERR("Unexpect result\r\n");
                 return OAD_ABORT;
             }
-#if defined(CONFIG_BT_SETTINGS)
+
             write_count += 1;
+            oad_env.hosal_offset = write_count * OTA_WRITE_FLASH_SIZE;
+#if defined(CONFIG_BT_SETTINGS)
             struct oad_ef_info ef_info;
             memcpy(&ef_info.file_info, &oad_env.file_info, sizeof(struct oad_file_info));
             ef_info.file_offset = write_count * OTA_WRITE_FLASH_SIZE;
@@ -308,8 +287,9 @@ static u8_t oad_image_data_handler(struct bt_conn *conn, const u8_t *data, u16_t
     if (oad_env.upgrd_offset > oad_env.upgrd_file_size) {
         return OAD_INVALID_IMAG;
     } else if (oad_env.upgrd_offset == oad_env.upgrd_file_size) {
-        if (wData.index)
-            oad_write_flash(wData.wdata_buf, wData.index);
+        if (wData.index) {
+            oad_write_flash(oad_env.upgrd_file_size, oad_env.hosal_offset, wData.wdata_buf, wData.index);
+        }
 
         if (wData.wdata_buf) {
             k_free(wData.wdata_buf);
@@ -421,6 +401,9 @@ static void oad_image_identity_handler(struct bt_conn *conn, const u8_t *data, u
         oad_env.upgrd_file_size = identity->file_size;
         oad_env.upgrd_crc32 = identity->crc32;
         BT_WARN("Send the image block request\r\n");
+#if !defined(CONFIG_BL_MCU_SDK)
+        hosal_ota_start(oad_env.upgrd_file_size);
+#endif
         oad_notify_block_req(conn);
     } else {
         oad_notity_image_identity(conn);
@@ -462,6 +445,74 @@ static struct {
 pt_table_id_type active_id = PT_TABLE_ID_INVALID;
 pt_table_stuff_config pt_table_stuff[2];
 
+static int fw_check_hash256(void)
+{
+    uint32_t bin_size;
+    uint32_t hash_addr;
+    pt_table_entry_config ptEntry;
+
+    if (oad_env.upgrd_file_size <= 32) {
+        return -1;
+    }
+    if (oad_env.w_img_end_addr <= 32) {
+        return -1;
+    }
+
+    bin_size = oad_env.upgrd_file_size - 32;
+    hash_addr = oad_env.w_img_end_addr - 32;
+
+    if (hal_boot2_get_active_entries_byname((uint8_t *)"FW", &ptEntry)) {
+        BT_WARN("Failed to get active entries by name\r\n");
+        return -1;
+    }
+
+#define CHECK_IMG_BUF_SIZE 512
+    uint8_t sha_check[32] = { 0 };
+    uint8_t dst_sha[32] = { 0 };
+    uint32_t read_size;
+    mbedtls_sha256_context sha256_ctx;
+    int i, offset = 0;
+    uint8_t r_buf[CHECK_IMG_BUF_SIZE];
+
+    BT_WARN("[OTA]prepare OTA partition info\r\n");
+    mbedtls_sha256_init(&sha256_ctx);
+    mbedtls_sha256_starts_ret(&sha256_ctx, 0);
+
+    memset(sha_check, 0, 32);
+    memset(dst_sha, 0, 32);
+    offset = 0;
+    while (offset < bin_size) {
+        (bin_size - offset >= CHECK_IMG_BUF_SIZE) ? (read_size = CHECK_IMG_BUF_SIZE) : (read_size = bin_size - offset);
+        if (flash_read(oad_env.new_img_addr + offset, r_buf, read_size)) {
+            BT_WARN("flash read failed \r\n");
+            return -1;
+        }
+        mbedtls_sha256_update_ret(&sha256_ctx, (const uint8_t *)r_buf, read_size);
+        offset += read_size;
+    }
+
+    mbedtls_sha256_finish_ret(&sha256_ctx, sha_check);
+
+    flash_read(hash_addr, dst_sha, 32);
+    for (i = 0; i < 32; i++) {
+        BT_WARN("%02X", dst_sha[i]);
+    }
+    puts("\r\nHeader SET SHA256 Checksum:");
+    for (i = 0; i < 32; i++) {
+        BT_WARN("%02X", sha_check[i]);
+    }
+
+    if (memcmp(sha_check, (const void *)dst_sha, 32) != 0) {
+        BT_WARN("sha256 check error\r\n");
+        return -1;
+    }
+    ptEntry.len = bin_size;
+    BT_WARN("[OTA] Update PARTITION, partition len is %lu\r\n", ptEntry.len);
+    hal_boot2_update_ptable(&ptEntry);
+
+    return 0;
+}
+
 static int oad_hal_boot2_partition_addr(const char *name, uint32_t *addr0, uint32_t *addr1, uint32_t *size0, uint32_t *size1, int *active)
 {
     int i;
@@ -570,5 +621,5 @@ void oad_service_enable(app_check_oad_cb cb)
     active_id = pt_table_get_active_partition_need_lock(pt_table_stuff);
     oad_get_boot2_partition_table();
 #endif
-    k_delayed_work_init(&oad_env.upgrd_work, oad_upgrade);
+    k_delayed_work_init(&oad_env.upgrd_work, ota_finish);
 }
diff --git a/components/ble/ble_stack/services/oad/oad_main.h b/components/ble/ble_stack/services/oad/oad_main.h
index ad64a9fe..8bf60af4 100644
--- a/components/ble/ble_stack/services/oad/oad_main.h
+++ b/components/ble/ble_stack/services/oad/oad_main.h
@@ -5,5 +5,5 @@
 
 typedef bool (*app_check_oad_cb)(u32_t cur_file_ver, u32_t new_file_ver);
 void oad_service_enable(app_check_oad_cb cb);
-void oad_upgrade(struct k_work *work);
+void ota_finish(struct k_work *work);
 #endif //__OAD_API_H__
\ No newline at end of file
diff --git a/components/ble/ble_stack/services/oad/oad_service.c b/components/ble/ble_stack/services/oad/oad_service.c
index 1ebf6f29..fa4ddca9 100644
--- a/components/ble/ble_stack/services/oad/oad_service.c
+++ b/components/ble/ble_stack/services/oad/oad_service.c
@@ -3,6 +3,7 @@
 #include "oad.h"
 #include "log.h"
 #include "hci_core.h"
+#include "conn_internal.h"
 
 oad_upper_recv_cb upper_recv_cb;
 oad_disc_cb disc_cb;
@@ -28,6 +29,10 @@ static void ble_oad_tx_mtu_size(struct bt_conn *conn, u8_t err,
 
 static void ble_oad_connected(struct bt_conn *conn, u8_t err)
 {
+    if (err || conn->type != BT_CONN_TYPE_LE) {
+        return;
+    }
+
     int ret = -1;
     int tx_octets = 0x00fb;
     int tx_time = 0x0848;
@@ -57,6 +62,10 @@ static void ble_oad_connected(struct bt_conn *conn, u8_t err)
 
 static void ble_oad_disconnected(struct bt_conn *conn, u8_t reason)
 {
+    if (conn->type != BT_CONN_TYPE_LE) {
+        return;
+    }
+
     if (conn == ble_oad_conn) {
         (disc_cb)(conn, reason);
     }
diff --git a/components/ble/blecontroller/lib/libblecontroller.a b/components/ble/blecontroller/lib/libblecontroller.a
index 5d879b33..3864f499 100644
Binary files a/components/ble/blecontroller/lib/libblecontroller.a and b/components/ble/blecontroller/lib/libblecontroller.a differ
diff --git a/components/ble/blecontroller/lib/libblecontroller_702_m0s1.a b/components/ble/blecontroller/lib/libblecontroller_702_m0s1.a
new file mode 100644
index 00000000..8e6d38a4
Binary files /dev/null and b/components/ble/blecontroller/lib/libblecontroller_702_m0s1.a differ
diff --git a/components/ble/blecontroller/lib/libblecontroller_702_m0s1s.a b/components/ble/blecontroller/lib/libblecontroller_702_m0s1s.a
new file mode 100644
index 00000000..8127fefd
Binary files /dev/null and b/components/ble/blecontroller/lib/libblecontroller_702_m0s1s.a differ
diff --git a/components/ble/blecontroller/lib/libblecontroller_702_std.a b/components/ble/blecontroller/lib/libblecontroller_702_std.a
new file mode 100644
index 00000000..7faebca0
Binary files /dev/null and b/components/ble/blecontroller/lib/libblecontroller_702_std.a differ