diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a05b6c..02e7d340 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,4 +3,6 @@ cmake_minimum_required(VERSION 3.15)
 add_subdirectory(bsp)
 add_subdirectory(components)
 add_subdirectory(drivers/lhal)
-add_subdirectory(drivers/soc/${CHIP})
+add_subdirectory(drivers/soc/${CHIP}/std)
+sdk_add_subdirectory_ifdef(CONFIG_RF drivers/soc/${CHIP}/rf)
+sdk_add_subdirectory_ifdef(CONFIG_RF drivers/rfparam)
diff --git a/drivers/soc/bl602/CMakeLists.txt b/drivers/soc/bl602/CMakeLists.txt
deleted file mode 100644
index cbf48753..00000000
--- a/drivers/soc/bl602/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-sdk_generate_library()
-
-sdk_library_add_sources(startup/start.S)
-sdk_library_add_sources(startup/start_load.c)
-sdk_library_add_sources(startup/system_bl602.c)
-sdk_library_add_sources(startup/interrupt.c)
-
-if(CONFIG_ROMAPI)
-sdk_library_add_sources(bl602_std/src/bl602_romapi.c)
-sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
-endif()
-
-sdk_library_add_sources(bl602_std/src/bl602_aon.c)
-sdk_library_add_sources(bl602_std/src/bl602_common.c)
-sdk_library_add_sources(bl602_std/src/bl602_clock.c)
-sdk_library_add_sources(bl602_std/src/bl602_ef_cfg.c)
-sdk_library_add_sources(bl602_std/src/bl602_glb.c)
-sdk_library_add_sources(bl602_std/src/bl602_hbn.c)
-sdk_library_add_sources(bl602_std/src/bl602_l1c.c)
-sdk_library_add_sources(bl602_std/src/bl602_pds.c)
-
-sdk_library_add_sources(bl602_std/src/bl602_sf_cfg.c)
-sdk_library_add_sources(bl602_std/src/bl602_sf_cfg_ext.c)
-sdk_library_add_sources(bl602_std/src/bl602_sf_ctrl.c)
-sdk_library_add_sources(bl602_std/src/bl602_sflash.c)
-sdk_library_add_sources(bl602_std/src/bl602_sflash_ext.c)
-sdk_library_add_sources(bl602_std/src/bl602_xip_sflash.c)
-sdk_library_add_sources(bl602_std/src/bl602_xip_sflash_ext.c)
-
-sdk_library_add_sources(port/bl602_clock.c)
-sdk_library_add_sources(port/bl602_flash.c)
-
-sdk_add_include_directories(
-bl602_std/include
-bl602_std/include/hardware
-)
-
-SET(MCPU "riscv-e24")
-SET(MARCH "rv32imafc")
-SET(MABI "ilp32f")
-
-sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
-sdk_add_compile_options(-march=${MARCH} -mabi=${MABI})
-sdk_add_link_options(-march=${MARCH} -mabi=${MABI})
-
-sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl602/std/CMakeLists.txt b/drivers/soc/bl602/std/CMakeLists.txt
new file mode 100644
index 00000000..1b1ed52b
--- /dev/null
+++ b/drivers/soc/bl602/std/CMakeLists.txt
@@ -0,0 +1,47 @@
+sdk_generate_library()
+
+sdk_library_add_sources(startup/start.S)
+sdk_library_add_sources(startup/start_load.c)
+sdk_library_add_sources(startup/system_bl602.c)
+sdk_library_add_sources(startup/interrupt.c)
+
+if(CONFIG_ROMAPI)
+sdk_library_add_sources(src/bl602_romapi.c)
+sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
+endif()
+
+sdk_library_add_sources(src/bl602_aon.c)
+sdk_library_add_sources(src/bl602_common.c)
+sdk_library_add_sources(src/bl602_clock.c)
+sdk_library_add_sources(src/bl602_ef_cfg.c)
+sdk_library_add_sources(src/bl602_glb.c)
+sdk_library_add_sources(src/bl602_hbn.c)
+sdk_library_add_sources(src/bl602_l1c.c)
+sdk_library_add_sources(src/bl602_pds.c)
+sdk_library_add_sources(src/bl602_tzc_sec.c)
+
+sdk_library_add_sources(src/bl602_sf_cfg.c)
+sdk_library_add_sources(src/bl602_sf_cfg_ext.c)
+sdk_library_add_sources(src/bl602_sf_ctrl.c)
+sdk_library_add_sources(src/bl602_sflash.c)
+sdk_library_add_sources(src/bl602_sflash_ext.c)
+sdk_library_add_sources(src/bl602_xip_sflash.c)
+sdk_library_add_sources(src/bl602_xip_sflash_ext.c)
+
+sdk_library_add_sources(port/bl602_clock.c)
+sdk_library_add_sources(port/bl602_flash.c)
+
+sdk_add_include_directories(
+include
+include/hardware
+)
+
+SET(MCPU "riscv-e24")
+SET(MARCH "rv32imafc")
+SET(MABI "ilp32f")
+
+sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
+sdk_add_compile_options(-march=${MARCH} -mabi=${MABI})
+sdk_add_link_options(-march=${MARCH} -mabi=${MABI})
+
+sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_aon.h b/drivers/soc/bl602/std/include/bl602_aon.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_aon.h
rename to drivers/soc/bl602/std/include/bl602_aon.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_clock.h b/drivers/soc/bl602/std/include/bl602_clock.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_clock.h
rename to drivers/soc/bl602/std/include/bl602_clock.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_common.h b/drivers/soc/bl602/std/include/bl602_common.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_common.h
rename to drivers/soc/bl602/std/include/bl602_common.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_ef_cfg.h b/drivers/soc/bl602/std/include/bl602_ef_cfg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_ef_cfg.h
rename to drivers/soc/bl602/std/include/bl602_ef_cfg.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_ef_ctrl.h b/drivers/soc/bl602/std/include/bl602_ef_ctrl.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_ef_ctrl.h
rename to drivers/soc/bl602/std/include/bl602_ef_ctrl.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_glb.h b/drivers/soc/bl602/std/include/bl602_glb.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_glb.h
rename to drivers/soc/bl602/std/include/bl602_glb.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_gpio.h b/drivers/soc/bl602/std/include/bl602_gpio.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_gpio.h
rename to drivers/soc/bl602/std/include/bl602_gpio.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_hbn.h b/drivers/soc/bl602/std/include/bl602_hbn.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_hbn.h
rename to drivers/soc/bl602/std/include/bl602_hbn.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_l1c.h b/drivers/soc/bl602/std/include/bl602_l1c.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_l1c.h
rename to drivers/soc/bl602/std/include/bl602_l1c.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_pds.h b/drivers/soc/bl602/std/include/bl602_pds.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_pds.h
rename to drivers/soc/bl602/std/include/bl602_pds.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_romdriver.h b/drivers/soc/bl602/std/include/bl602_romdriver.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_romdriver.h
rename to drivers/soc/bl602/std/include/bl602_romdriver.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sdu.h b/drivers/soc/bl602/std/include/bl602_sdu.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sdu.h
rename to drivers/soc/bl602/std/include/bl602_sdu.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sf_cfg.h b/drivers/soc/bl602/std/include/bl602_sf_cfg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sf_cfg.h
rename to drivers/soc/bl602/std/include/bl602_sf_cfg.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sf_cfg_ext.h b/drivers/soc/bl602/std/include/bl602_sf_cfg_ext.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sf_cfg_ext.h
rename to drivers/soc/bl602/std/include/bl602_sf_cfg_ext.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sf_ctrl.h b/drivers/soc/bl602/std/include/bl602_sf_ctrl.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sf_ctrl.h
rename to drivers/soc/bl602/std/include/bl602_sf_ctrl.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sflash.h b/drivers/soc/bl602/std/include/bl602_sflash.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sflash.h
rename to drivers/soc/bl602/std/include/bl602_sflash.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_sflash_ext.h b/drivers/soc/bl602/std/include/bl602_sflash_ext.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_sflash_ext.h
rename to drivers/soc/bl602/std/include/bl602_sflash_ext.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_tzc_sec.h b/drivers/soc/bl602/std/include/bl602_tzc_sec.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_tzc_sec.h
rename to drivers/soc/bl602/std/include/bl602_tzc_sec.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_xip_sflash.h b/drivers/soc/bl602/std/include/bl602_xip_sflash.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_xip_sflash.h
rename to drivers/soc/bl602/std/include/bl602_xip_sflash.h
diff --git a/drivers/soc/bl602/bl602_std/include/bl602_xip_sflash_ext.h b/drivers/soc/bl602/std/include/bl602_xip_sflash_ext.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/bl602_xip_sflash_ext.h
rename to drivers/soc/bl602/std/include/bl602_xip_sflash_ext.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/aon_reg.h b/drivers/soc/bl602/std/include/hardware/aon_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/aon_reg.h
rename to drivers/soc/bl602/std/include/hardware/aon_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/bl602.h b/drivers/soc/bl602/std/include/hardware/bl602.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/bl602.h
rename to drivers/soc/bl602/std/include/hardware/bl602.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/ef_ctrl_reg.h b/drivers/soc/bl602/std/include/hardware/ef_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/ef_ctrl_reg.h
rename to drivers/soc/bl602/std/include/hardware/ef_ctrl_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/ef_data_0_reg.h b/drivers/soc/bl602/std/include/hardware/ef_data_0_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/ef_data_0_reg.h
rename to drivers/soc/bl602/std/include/hardware/ef_data_0_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/ef_data_reg.h b/drivers/soc/bl602/std/include/hardware/ef_data_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/ef_data_reg.h
rename to drivers/soc/bl602/std/include/hardware/ef_data_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/glb_reg.h b/drivers/soc/bl602/std/include/hardware/glb_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/glb_reg.h
rename to drivers/soc/bl602/std/include/hardware/glb_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/hbn_reg.h b/drivers/soc/bl602/std/include/hardware/hbn_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/hbn_reg.h
rename to drivers/soc/bl602/std/include/hardware/hbn_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/l1c_reg.h b/drivers/soc/bl602/std/include/hardware/l1c_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/l1c_reg.h
rename to drivers/soc/bl602/std/include/hardware/l1c_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/pds_reg.h b/drivers/soc/bl602/std/include/hardware/pds_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/pds_reg.h
rename to drivers/soc/bl602/std/include/hardware/pds_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/sf_ctrl_reg.h b/drivers/soc/bl602/std/include/hardware/sf_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/sf_ctrl_reg.h
rename to drivers/soc/bl602/std/include/hardware/sf_ctrl_reg.h
diff --git a/drivers/soc/bl602/bl602_std/include/hardware/tzc_sec_reg.h b/drivers/soc/bl602/std/include/hardware/tzc_sec_reg.h
similarity index 100%
rename from drivers/soc/bl602/bl602_std/include/hardware/tzc_sec_reg.h
rename to drivers/soc/bl602/std/include/hardware/tzc_sec_reg.h
diff --git a/drivers/soc/bl602/port/bl602_clock.c b/drivers/soc/bl602/std/port/bl602_clock.c
similarity index 100%
rename from drivers/soc/bl602/port/bl602_clock.c
rename to drivers/soc/bl602/std/port/bl602_clock.c
diff --git a/drivers/soc/bl602/port/bl602_flash.c b/drivers/soc/bl602/std/port/bl602_flash.c
similarity index 100%
rename from drivers/soc/bl602/port/bl602_flash.c
rename to drivers/soc/bl602/std/port/bl602_flash.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_aon.c b/drivers/soc/bl602/std/src/bl602_aon.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_aon.c
rename to drivers/soc/bl602/std/src/bl602_aon.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_clock.c b/drivers/soc/bl602/std/src/bl602_clock.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_clock.c
rename to drivers/soc/bl602/std/src/bl602_clock.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_common.c b/drivers/soc/bl602/std/src/bl602_common.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_common.c
rename to drivers/soc/bl602/std/src/bl602_common.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_ef_cfg.c b/drivers/soc/bl602/std/src/bl602_ef_cfg.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_ef_cfg.c
rename to drivers/soc/bl602/std/src/bl602_ef_cfg.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_ef_ctrl.c b/drivers/soc/bl602/std/src/bl602_ef_ctrl.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_ef_ctrl.c
rename to drivers/soc/bl602/std/src/bl602_ef_ctrl.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_glb.c b/drivers/soc/bl602/std/src/bl602_glb.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_glb.c
rename to drivers/soc/bl602/std/src/bl602_glb.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_hbn.c b/drivers/soc/bl602/std/src/bl602_hbn.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_hbn.c
rename to drivers/soc/bl602/std/src/bl602_hbn.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_l1c.c b/drivers/soc/bl602/std/src/bl602_l1c.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_l1c.c
rename to drivers/soc/bl602/std/src/bl602_l1c.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_pds.c b/drivers/soc/bl602/std/src/bl602_pds.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_pds.c
rename to drivers/soc/bl602/std/src/bl602_pds.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_romapi.c b/drivers/soc/bl602/std/src/bl602_romapi.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_romapi.c
rename to drivers/soc/bl602/std/src/bl602_romapi.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_sf_cfg.c b/drivers/soc/bl602/std/src/bl602_sf_cfg.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_sf_cfg.c
rename to drivers/soc/bl602/std/src/bl602_sf_cfg.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_sf_cfg_ext.c b/drivers/soc/bl602/std/src/bl602_sf_cfg_ext.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_sf_cfg_ext.c
rename to drivers/soc/bl602/std/src/bl602_sf_cfg_ext.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_sf_ctrl.c b/drivers/soc/bl602/std/src/bl602_sf_ctrl.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_sf_ctrl.c
rename to drivers/soc/bl602/std/src/bl602_sf_ctrl.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_sflash.c b/drivers/soc/bl602/std/src/bl602_sflash.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_sflash.c
rename to drivers/soc/bl602/std/src/bl602_sflash.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_sflash_ext.c b/drivers/soc/bl602/std/src/bl602_sflash_ext.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_sflash_ext.c
rename to drivers/soc/bl602/std/src/bl602_sflash_ext.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_tzc_sec.c b/drivers/soc/bl602/std/src/bl602_tzc_sec.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_tzc_sec.c
rename to drivers/soc/bl602/std/src/bl602_tzc_sec.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_xip_sflash.c b/drivers/soc/bl602/std/src/bl602_xip_sflash.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_xip_sflash.c
rename to drivers/soc/bl602/std/src/bl602_xip_sflash.c
diff --git a/drivers/soc/bl602/bl602_std/src/bl602_xip_sflash_ext.c b/drivers/soc/bl602/std/src/bl602_xip_sflash_ext.c
similarity index 100%
rename from drivers/soc/bl602/bl602_std/src/bl602_xip_sflash_ext.c
rename to drivers/soc/bl602/std/src/bl602_xip_sflash_ext.c
diff --git a/drivers/soc/bl602/startup/interrupt.c b/drivers/soc/bl602/std/startup/interrupt.c
similarity index 100%
rename from drivers/soc/bl602/startup/interrupt.c
rename to drivers/soc/bl602/std/startup/interrupt.c
diff --git a/drivers/soc/bl602/startup/start.S b/drivers/soc/bl602/std/startup/start.S
similarity index 100%
rename from drivers/soc/bl602/startup/start.S
rename to drivers/soc/bl602/std/startup/start.S
diff --git a/drivers/soc/bl602/startup/start_load.c b/drivers/soc/bl602/std/startup/start_load.c
similarity index 100%
rename from drivers/soc/bl602/startup/start_load.c
rename to drivers/soc/bl602/std/startup/start_load.c
diff --git a/drivers/soc/bl602/startup/system_bl602.c b/drivers/soc/bl602/std/startup/system_bl602.c
similarity index 100%
rename from drivers/soc/bl602/startup/system_bl602.c
rename to drivers/soc/bl602/std/startup/system_bl602.c
diff --git a/drivers/soc/bl616/CMakeLists.txt b/drivers/soc/bl616/CMakeLists.txt
deleted file mode 100644
index 3f5b7ea2..00000000
--- a/drivers/soc/bl616/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-sdk_generate_library()
-
-sdk_library_add_sources(startup/start.S)
-sdk_library_add_sources(startup/vector.S)
-sdk_library_add_sources(startup/riscv_fpu.S)
-sdk_library_add_sources(startup/start_load.c)
-sdk_library_add_sources(startup/system_bl616.c)
-sdk_library_add_sources(startup/interrupt.c)
-
-if(CONFIG_ROMAPI)
-sdk_library_add_sources(bl616_std/src/bl616_romapi_e907.c)
-sdk_library_add_sources(bl616_std/src/bl616_romapi_patch.c)
-sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
-else()
-sdk_library_add_sources(bl616_std/src/bl616_aon.c)
-sdk_library_add_sources(bl616_std/src/bl616_clock.c)
-sdk_library_add_sources(bl616_std/src/bl616_glb_gpio.c)
-sdk_library_add_sources(bl616_std/src/bl616_glb.c)
-sdk_library_add_sources(bl616_std/src/bl616_hbn.c)
-sdk_library_add_sources(bl616_std/src/bl616_l1c.c)
-sdk_library_add_sources(bl616_std/src/bl616_pds.c)
-sdk_library_add_sources(bl616_std/src/bl616_sf_cfg.c)
-sdk_library_add_sources(bl616_std/src/bl616_sf_ctrl.c)
-sdk_library_add_sources(bl616_std/src/bl616_sflash.c)
-sdk_library_add_sources(bl616_std/src/bl616_xip_sflash.c)
-endif()
-
-sdk_library_add_sources(bl616_std/src/bl616_common.c)
-sdk_library_add_sources(bl616_std/src/bl616_ef_cfg.c)
-sdk_library_add_sources(bl616_std/src/bl616_sdh.c)
-sdk_library_add_sources(bl616_std/src/bl616_tzc_sec.c)
-sdk_library_add_sources(bl616_std/src/bl616_psram.c)
-
-sdk_library_add_sources(port/bl616_clock.c)
-sdk_library_add_sources(port/bl616_flash.c)
-
-sdk_add_include_directories(
-bl616_std/include
-bl616_std/include/hardware
-)
-
-SET(MCPU "e907")
-SET(MARCH "rv32imafcpzpsfoperand_xtheade")
-SET(MABI "ilp32f")
-
-sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
-sdk_add_compile_options(-march=${MARCH} -mabi=${MABI} -mtune=${MCPU})
-sdk_add_link_options(-march=${MARCH} -mabi=${MABI} -mtune=${MCPU})
-
-sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl616/std/CMakeLists.txt b/drivers/soc/bl616/std/CMakeLists.txt
new file mode 100644
index 00000000..33740cd6
--- /dev/null
+++ b/drivers/soc/bl616/std/CMakeLists.txt
@@ -0,0 +1,58 @@
+sdk_generate_library()
+
+sdk_library_add_sources(startup/start.S)
+sdk_library_add_sources(startup/vector.S)
+sdk_library_add_sources(startup/riscv_fpu.S)
+sdk_library_add_sources(startup/start_load.c)
+sdk_library_add_sources(startup/system_bl616.c)
+sdk_library_add_sources(startup/interrupt.c)
+
+if(CONFIG_ROMAPI)
+sdk_library_add_sources(src/bl616_romapi_e907.c)
+sdk_library_add_sources(src/bl616_romapi_patch.c)
+sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
+else()
+sdk_library_add_sources(src/bl616_aon.c)
+sdk_library_add_sources(src/bl616_clock.c)
+sdk_library_add_sources(src/bl616_glb_gpio.c)
+sdk_library_add_sources(src/bl616_glb.c)
+sdk_library_add_sources(src/bl616_hbn.c)
+sdk_library_add_sources(src/bl616_l1c.c)
+sdk_library_add_sources(src/bl616_pds.c)
+sdk_library_add_sources(src/bl616_sf_cfg.c)
+sdk_library_add_sources(src/bl616_sf_ctrl.c)
+sdk_library_add_sources(src/bl616_sflash.c)
+sdk_library_add_sources(src/bl616_xip_sflash.c)
+endif()
+
+sdk_library_add_sources(src/bl616_common.c)
+sdk_library_add_sources(src/bl616_ef_cfg.c)
+sdk_library_add_sources(src/bl616_sdh.c)
+sdk_library_add_sources(src/bl616_tzc_sec.c)
+sdk_library_add_sources(src/bl616_psram.c)
+sdk_library_add_sources(src/bl616_audac.c)
+sdk_library_add_sources(src/bl616_pec.c)
+
+if(CONFIG_RF)
+sdk_library_add_sources(src/bl616_mfg_efuse.c)
+sdk_library_add_sources(src/bl616_mfg_flash.c)
+sdk_library_add_sources(src/bl616_mfg_media.c)
+endif()
+
+sdk_library_add_sources(port/bl616_clock.c)
+sdk_library_add_sources(port/bl616_flash.c)
+
+sdk_add_include_directories(
+include
+include/hardware
+)
+
+SET(MCPU "e907")
+SET(MARCH "rv32imafcpzpsfoperand_xtheade")
+SET(MABI "ilp32f")
+
+sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
+sdk_add_compile_options(-march=${MARCH} -mabi=${MABI} -mtune=${MCPU})
+sdk_add_link_options(-march=${MARCH} -mabi=${MABI} -mtune=${MCPU})
+
+sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_acomp.h b/drivers/soc/bl616/std/include/bl616_acomp.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_acomp.h
rename to drivers/soc/bl616/std/include/bl616_acomp.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_aon.h b/drivers/soc/bl616/std/include/bl616_aon.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_aon.h
rename to drivers/soc/bl616/std/include/bl616_aon.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_audac.h b/drivers/soc/bl616/std/include/bl616_audac.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_audac.h
rename to drivers/soc/bl616/std/include/bl616_audac.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_clock.h b/drivers/soc/bl616/std/include/bl616_clock.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_clock.h
rename to drivers/soc/bl616/std/include/bl616_clock.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_common.h b/drivers/soc/bl616/std/include/bl616_common.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_common.h
rename to drivers/soc/bl616/std/include/bl616_common.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_common_s.h b/drivers/soc/bl616/std/include/bl616_common_s.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_common_s.h
rename to drivers/soc/bl616/std/include/bl616_common_s.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_ef_cfg.h b/drivers/soc/bl616/std/include/bl616_ef_cfg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_ef_cfg.h
rename to drivers/soc/bl616/std/include/bl616_ef_cfg.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_ef_ctrl.h b/drivers/soc/bl616/std/include/bl616_ef_ctrl.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_ef_ctrl.h
rename to drivers/soc/bl616/std/include/bl616_ef_ctrl.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_glb.h b/drivers/soc/bl616/std/include/bl616_glb.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_glb.h
rename to drivers/soc/bl616/std/include/bl616_glb.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_glb_gpio.h b/drivers/soc/bl616/std/include/bl616_glb_gpio.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_glb_gpio.h
rename to drivers/soc/bl616/std/include/bl616_glb_gpio.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_gpio.h b/drivers/soc/bl616/std/include/bl616_gpio.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_gpio.h
rename to drivers/soc/bl616/std/include/bl616_gpio.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_hbn.h b/drivers/soc/bl616/std/include/bl616_hbn.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_hbn.h
rename to drivers/soc/bl616/std/include/bl616_hbn.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_l1c.h b/drivers/soc/bl616/std/include/bl616_l1c.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_l1c.h
rename to drivers/soc/bl616/std/include/bl616_l1c.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_mfg_efuse.h b/drivers/soc/bl616/std/include/bl616_mfg_efuse.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_mfg_efuse.h
rename to drivers/soc/bl616/std/include/bl616_mfg_efuse.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_mfg_flash.h b/drivers/soc/bl616/std/include/bl616_mfg_flash.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_mfg_flash.h
rename to drivers/soc/bl616/std/include/bl616_mfg_flash.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_mfg_media.h b/drivers/soc/bl616/std/include/bl616_mfg_media.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_mfg_media.h
rename to drivers/soc/bl616/std/include/bl616_mfg_media.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_pds.h b/drivers/soc/bl616/std/include/bl616_pds.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_pds.h
rename to drivers/soc/bl616/std/include/bl616_pds.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_psram.h b/drivers/soc/bl616/std/include/bl616_psram.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_psram.h
rename to drivers/soc/bl616/std/include/bl616_psram.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_romapi_patch.h b/drivers/soc/bl616/std/include/bl616_romapi_patch.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_romapi_patch.h
rename to drivers/soc/bl616/std/include/bl616_romapi_patch.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_romdriver_e907.h b/drivers/soc/bl616/std/include/bl616_romdriver_e907.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_romdriver_e907.h
rename to drivers/soc/bl616/std/include/bl616_romdriver_e907.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_sdh.h b/drivers/soc/bl616/std/include/bl616_sdh.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_sdh.h
rename to drivers/soc/bl616/std/include/bl616_sdh.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_sdu.h b/drivers/soc/bl616/std/include/bl616_sdu.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_sdu.h
rename to drivers/soc/bl616/std/include/bl616_sdu.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_sf_cfg.h b/drivers/soc/bl616/std/include/bl616_sf_cfg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_sf_cfg.h
rename to drivers/soc/bl616/std/include/bl616_sf_cfg.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_sf_ctrl.h b/drivers/soc/bl616/std/include/bl616_sf_ctrl.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_sf_ctrl.h
rename to drivers/soc/bl616/std/include/bl616_sf_ctrl.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_sflash.h b/drivers/soc/bl616/std/include/bl616_sflash.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_sflash.h
rename to drivers/soc/bl616/std/include/bl616_sflash.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_tzc_sec.h b/drivers/soc/bl616/std/include/bl616_tzc_sec.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_tzc_sec.h
rename to drivers/soc/bl616/std/include/bl616_tzc_sec.h
diff --git a/drivers/soc/bl616/bl616_std/include/bl616_xip_sflash.h b/drivers/soc/bl616/std/include/bl616_xip_sflash.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/bl616_xip_sflash.h
rename to drivers/soc/bl616/std/include/bl616_xip_sflash.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/aon_reg.h b/drivers/soc/bl616/std/include/hardware/aon_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/aon_reg.h
rename to drivers/soc/bl616/std/include/hardware/aon_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/auadc_reg.h b/drivers/soc/bl616/std/include/hardware/auadc_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/auadc_reg.h
rename to drivers/soc/bl616/std/include/hardware/auadc_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/audac_reg.h b/drivers/soc/bl616/std/include/hardware/audac_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/audac_reg.h
rename to drivers/soc/bl616/std/include/hardware/audac_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/bl616.h b/drivers/soc/bl616/std/include/hardware/bl616.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/bl616.h
rename to drivers/soc/bl616/std/include/hardware/bl616.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/cci_reg.h b/drivers/soc/bl616/std/include/hardware/cci_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/cci_reg.h
rename to drivers/soc/bl616/std/include/hardware/cci_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/ef_ctrl_reg.h b/drivers/soc/bl616/std/include/hardware/ef_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/ef_ctrl_reg.h
rename to drivers/soc/bl616/std/include/hardware/ef_ctrl_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/ef_data_reg.h b/drivers/soc/bl616/std/include/hardware/ef_data_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/ef_data_reg.h
rename to drivers/soc/bl616/std/include/hardware/ef_data_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/glb_reg.h b/drivers/soc/bl616/std/include/hardware/glb_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/glb_reg.h
rename to drivers/soc/bl616/std/include/hardware/glb_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/hbn_reg.h b/drivers/soc/bl616/std/include/hardware/hbn_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/hbn_reg.h
rename to drivers/soc/bl616/std/include/hardware/hbn_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/mcu_misc_reg.h b/drivers/soc/bl616/std/include/hardware/mcu_misc_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/mcu_misc_reg.h
rename to drivers/soc/bl616/std/include/hardware/mcu_misc_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/mm_glb_reg.h b/drivers/soc/bl616/std/include/hardware/mm_glb_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/mm_glb_reg.h
rename to drivers/soc/bl616/std/include/hardware/mm_glb_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/mm_misc_reg.h b/drivers/soc/bl616/std/include/hardware/mm_misc_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/mm_misc_reg.h
rename to drivers/soc/bl616/std/include/hardware/mm_misc_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/pds_reg.h b/drivers/soc/bl616/std/include/hardware/pds_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/pds_reg.h
rename to drivers/soc/bl616/std/include/hardware/pds_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/psram_reg.h b/drivers/soc/bl616/std/include/hardware/psram_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/psram_reg.h
rename to drivers/soc/bl616/std/include/hardware/psram_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/sdh_reg.h b/drivers/soc/bl616/std/include/hardware/sdh_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/sdh_reg.h
rename to drivers/soc/bl616/std/include/hardware/sdh_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/sf_ctrl_reg.h b/drivers/soc/bl616/std/include/hardware/sf_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/sf_ctrl_reg.h
rename to drivers/soc/bl616/std/include/hardware/sf_ctrl_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/tzc_nsec_reg.h b/drivers/soc/bl616/std/include/hardware/tzc_nsec_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/tzc_nsec_reg.h
rename to drivers/soc/bl616/std/include/hardware/tzc_nsec_reg.h
diff --git a/drivers/soc/bl616/bl616_std/include/hardware/tzc_sec_reg.h b/drivers/soc/bl616/std/include/hardware/tzc_sec_reg.h
similarity index 100%
rename from drivers/soc/bl616/bl616_std/include/hardware/tzc_sec_reg.h
rename to drivers/soc/bl616/std/include/hardware/tzc_sec_reg.h
diff --git a/drivers/soc/bl616/port/bl616_clock.c b/drivers/soc/bl616/std/port/bl616_clock.c
similarity index 100%
rename from drivers/soc/bl616/port/bl616_clock.c
rename to drivers/soc/bl616/std/port/bl616_clock.c
diff --git a/drivers/soc/bl616/port/bl616_flash.c b/drivers/soc/bl616/std/port/bl616_flash.c
similarity index 100%
rename from drivers/soc/bl616/port/bl616_flash.c
rename to drivers/soc/bl616/std/port/bl616_flash.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_aon.c b/drivers/soc/bl616/std/src/bl616_aon.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_aon.c
rename to drivers/soc/bl616/std/src/bl616_aon.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_audac.c b/drivers/soc/bl616/std/src/bl616_audac.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_audac.c
rename to drivers/soc/bl616/std/src/bl616_audac.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_clock.c b/drivers/soc/bl616/std/src/bl616_clock.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_clock.c
rename to drivers/soc/bl616/std/src/bl616_clock.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_common.c b/drivers/soc/bl616/std/src/bl616_common.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_common.c
rename to drivers/soc/bl616/std/src/bl616_common.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_common_s.c b/drivers/soc/bl616/std/src/bl616_common_s.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_common_s.c
rename to drivers/soc/bl616/std/src/bl616_common_s.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_ef_cfg.c b/drivers/soc/bl616/std/src/bl616_ef_cfg.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_ef_cfg.c
rename to drivers/soc/bl616/std/src/bl616_ef_cfg.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_ef_ctrl.c b/drivers/soc/bl616/std/src/bl616_ef_ctrl.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_ef_ctrl.c
rename to drivers/soc/bl616/std/src/bl616_ef_ctrl.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_glb.c b/drivers/soc/bl616/std/src/bl616_glb.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_glb.c
rename to drivers/soc/bl616/std/src/bl616_glb.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_glb_gpio.c b/drivers/soc/bl616/std/src/bl616_glb_gpio.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_glb_gpio.c
rename to drivers/soc/bl616/std/src/bl616_glb_gpio.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_hbn.c b/drivers/soc/bl616/std/src/bl616_hbn.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_hbn.c
rename to drivers/soc/bl616/std/src/bl616_hbn.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_l1c.c b/drivers/soc/bl616/std/src/bl616_l1c.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_l1c.c
rename to drivers/soc/bl616/std/src/bl616_l1c.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_mfg_efuse.c b/drivers/soc/bl616/std/src/bl616_mfg_efuse.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_mfg_efuse.c
rename to drivers/soc/bl616/std/src/bl616_mfg_efuse.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_mfg_flash.c b/drivers/soc/bl616/std/src/bl616_mfg_flash.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_mfg_flash.c
rename to drivers/soc/bl616/std/src/bl616_mfg_flash.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_mfg_media.c b/drivers/soc/bl616/std/src/bl616_mfg_media.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_mfg_media.c
rename to drivers/soc/bl616/std/src/bl616_mfg_media.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_pds.c b/drivers/soc/bl616/std/src/bl616_pds.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_pds.c
rename to drivers/soc/bl616/std/src/bl616_pds.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_psram.c b/drivers/soc/bl616/std/src/bl616_psram.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_psram.c
rename to drivers/soc/bl616/std/src/bl616_psram.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_romapi_e907.c b/drivers/soc/bl616/std/src/bl616_romapi_e907.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_romapi_e907.c
rename to drivers/soc/bl616/std/src/bl616_romapi_e907.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_romapi_patch.c b/drivers/soc/bl616/std/src/bl616_romapi_patch.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_romapi_patch.c
rename to drivers/soc/bl616/std/src/bl616_romapi_patch.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_romdriver_e907.c b/drivers/soc/bl616/std/src/bl616_romdriver_e907.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_romdriver_e907.c
rename to drivers/soc/bl616/std/src/bl616_romdriver_e907.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_sdh.c b/drivers/soc/bl616/std/src/bl616_sdh.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_sdh.c
rename to drivers/soc/bl616/std/src/bl616_sdh.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_sdu.c b/drivers/soc/bl616/std/src/bl616_sdu.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_sdu.c
rename to drivers/soc/bl616/std/src/bl616_sdu.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_sf_cfg.c b/drivers/soc/bl616/std/src/bl616_sf_cfg.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_sf_cfg.c
rename to drivers/soc/bl616/std/src/bl616_sf_cfg.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_sf_ctrl.c b/drivers/soc/bl616/std/src/bl616_sf_ctrl.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_sf_ctrl.c
rename to drivers/soc/bl616/std/src/bl616_sf_ctrl.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_sflash.c b/drivers/soc/bl616/std/src/bl616_sflash.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_sflash.c
rename to drivers/soc/bl616/std/src/bl616_sflash.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_tzc_sec.c b/drivers/soc/bl616/std/src/bl616_tzc_sec.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_tzc_sec.c
rename to drivers/soc/bl616/std/src/bl616_tzc_sec.c
diff --git a/drivers/soc/bl616/bl616_std/src/bl616_xip_sflash.c b/drivers/soc/bl616/std/src/bl616_xip_sflash.c
similarity index 100%
rename from drivers/soc/bl616/bl616_std/src/bl616_xip_sflash.c
rename to drivers/soc/bl616/std/src/bl616_xip_sflash.c
diff --git a/drivers/soc/bl616/startup/interrupt.c b/drivers/soc/bl616/std/startup/interrupt.c
similarity index 100%
rename from drivers/soc/bl616/startup/interrupt.c
rename to drivers/soc/bl616/std/startup/interrupt.c
diff --git a/drivers/soc/bl616/startup/irq_ctx.h b/drivers/soc/bl616/std/startup/irq_ctx.h
similarity index 100%
rename from drivers/soc/bl616/startup/irq_ctx.h
rename to drivers/soc/bl616/std/startup/irq_ctx.h
diff --git a/drivers/soc/bl616/startup/riscv_fpu.S b/drivers/soc/bl616/std/startup/riscv_fpu.S
similarity index 100%
rename from drivers/soc/bl616/startup/riscv_fpu.S
rename to drivers/soc/bl616/std/startup/riscv_fpu.S
diff --git a/drivers/soc/bl616/startup/start.S b/drivers/soc/bl616/std/startup/start.S
similarity index 100%
rename from drivers/soc/bl616/startup/start.S
rename to drivers/soc/bl616/std/startup/start.S
diff --git a/drivers/soc/bl616/startup/start_load.c b/drivers/soc/bl616/std/startup/start_load.c
similarity index 100%
rename from drivers/soc/bl616/startup/start_load.c
rename to drivers/soc/bl616/std/startup/start_load.c
diff --git a/drivers/soc/bl616/startup/system_bl616.c b/drivers/soc/bl616/std/startup/system_bl616.c
similarity index 100%
rename from drivers/soc/bl616/startup/system_bl616.c
rename to drivers/soc/bl616/std/startup/system_bl616.c
diff --git a/drivers/soc/bl616/startup/vector.S b/drivers/soc/bl616/std/startup/vector.S
similarity index 100%
rename from drivers/soc/bl616/startup/vector.S
rename to drivers/soc/bl616/std/startup/vector.S
diff --git a/drivers/soc/bl702/CMakeLists.txt b/drivers/soc/bl702/CMakeLists.txt
deleted file mode 100644
index 41259f12..00000000
--- a/drivers/soc/bl702/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-sdk_generate_library()
-
-sdk_library_add_sources(startup/start.S)
-sdk_library_add_sources(startup/start_load.c)
-sdk_library_add_sources(startup/system_bl702.c)
-sdk_library_add_sources(startup/interrupt.c)
-
-if(CONFIG_ROMAPI)
-sdk_library_add_sources(bl702_std/src/bl702_romapi.c)
-sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
-endif()
-
-sdk_library_add_sources(bl702_std/src/bl702_aon.c)
-sdk_library_add_sources(bl702_std/src/bl702_common.c)
-sdk_library_add_sources(bl702_std/src/bl702_clock.c)
-sdk_library_add_sources(bl702_std/src/bl702_ef_cfg.c)
-sdk_library_add_sources(bl702_std/src/bl702_glb.c)
-sdk_library_add_sources(bl702_std/src/bl702_hbn.c)
-sdk_library_add_sources(bl702_std/src/bl702_l1c.c)
-sdk_library_add_sources(bl702_std/src/bl702_pds.c)
-
-sdk_library_add_sources(bl702_std/src/bl702_sf_cfg.c)
-sdk_library_add_sources(bl702_std/src/bl702_sf_cfg_ext.c)
-sdk_library_add_sources(bl702_std/src/bl702_sf_ctrl.c)
-sdk_library_add_sources(bl702_std/src/bl702_sflash.c)
-sdk_library_add_sources(bl702_std/src/bl702_sflash_ext.c)
-sdk_library_add_sources(bl702_std/src/bl702_xip_sflash.c)
-sdk_library_add_sources(bl702_std/src/bl702_xip_sflash_ext.c)
-
-sdk_library_add_sources(port/bl702_clock.c)
-sdk_library_add_sources(port/bl702_flash.c)
-
-sdk_add_include_directories(
-bl702_std/include
-bl702_std/include/hardware
-)
-
-SET(MCPU "riscv-e24")
-SET(MARCH "rv32imafc")
-SET(MABI "ilp32f")
-
-sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
-sdk_add_compile_options(-march=${MARCH} -mabi=${MABI})
-sdk_add_link_options(-march=${MARCH} -mabi=${MABI})
-
-sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl702/std/CMakeLists.txt b/drivers/soc/bl702/std/CMakeLists.txt
new file mode 100644
index 00000000..4a91585c
--- /dev/null
+++ b/drivers/soc/bl702/std/CMakeLists.txt
@@ -0,0 +1,48 @@
+sdk_generate_library()
+
+sdk_library_add_sources(startup/start.S)
+sdk_library_add_sources(startup/start_load.c)
+sdk_library_add_sources(startup/system_bl702.c)
+sdk_library_add_sources(startup/interrupt.c)
+
+if(CONFIG_ROMAPI)
+sdk_library_add_sources(src/bl702_romapi.c)
+sdk_add_compile_definitions(-DBFLB_USE_ROM_DRIVER)
+endif()
+
+sdk_library_add_sources(src/bl702_aon.c)
+sdk_library_add_sources(src/bl702_common.c)
+sdk_library_add_sources(src/bl702_clock.c)
+sdk_library_add_sources(src/bl702_ef_cfg.c)
+sdk_library_add_sources(src/bl702_glb.c)
+sdk_library_add_sources(src/bl702_hbn.c)
+sdk_library_add_sources(src/bl702_l1c.c)
+sdk_library_add_sources(src/bl702_pds.c)
+
+sdk_library_add_sources(src/bl702_sf_cfg.c)
+sdk_library_add_sources(src/bl702_sf_cfg_ext.c)
+sdk_library_add_sources(src/bl702_sf_ctrl.c)
+sdk_library_add_sources(src/bl702_sflash.c)
+sdk_library_add_sources(src/bl702_sflash_ext.c)
+sdk_library_add_sources(src/bl702_xip_sflash.c)
+sdk_library_add_sources(src/bl702_xip_sflash_ext.c)
+
+sdk_library_add_sources(src/bl702_psram.c)
+
+sdk_library_add_sources(port/bl702_clock.c)
+sdk_library_add_sources(port/bl702_flash.c)
+
+sdk_add_include_directories(
+include
+include/hardware
+)
+
+SET(MCPU "riscv-e24")
+SET(MARCH "rv32imafc")
+SET(MABI "ilp32f")
+
+sdk_add_compile_definitions(-DARCH_RISCV -DBFLB_USE_HAL_DRIVER)
+sdk_add_compile_options(-march=${MARCH} -mabi=${MABI})
+sdk_add_link_options(-march=${MARCH} -mabi=${MABI})
+
+sdk_add_compile_definitions(-DCONFIG_IRQ_NUM=80)
\ No newline at end of file
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_aon.h b/drivers/soc/bl702/std/include/bl702_aon.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_aon.h
rename to drivers/soc/bl702/std/include/bl702_aon.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_clock.h b/drivers/soc/bl702/std/include/bl702_clock.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_clock.h
rename to drivers/soc/bl702/std/include/bl702_clock.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_common.h b/drivers/soc/bl702/std/include/bl702_common.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_common.h
rename to drivers/soc/bl702/std/include/bl702_common.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_ef_cfg.h b/drivers/soc/bl702/std/include/bl702_ef_cfg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_ef_cfg.h
rename to drivers/soc/bl702/std/include/bl702_ef_cfg.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_ef_ctrl.h b/drivers/soc/bl702/std/include/bl702_ef_ctrl.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_ef_ctrl.h
rename to drivers/soc/bl702/std/include/bl702_ef_ctrl.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_glb.h b/drivers/soc/bl702/std/include/bl702_glb.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_glb.h
rename to drivers/soc/bl702/std/include/bl702_glb.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_gpio.h b/drivers/soc/bl702/std/include/bl702_gpio.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_gpio.h
rename to drivers/soc/bl702/std/include/bl702_gpio.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_hbn.h b/drivers/soc/bl702/std/include/bl702_hbn.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_hbn.h
rename to drivers/soc/bl702/std/include/bl702_hbn.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_l1c.h b/drivers/soc/bl702/std/include/bl702_l1c.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_l1c.h
rename to drivers/soc/bl702/std/include/bl702_l1c.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_nf_cfg.h b/drivers/soc/bl702/std/include/bl702_nf_cfg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_nf_cfg.h
rename to drivers/soc/bl702/std/include/bl702_nf_cfg.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_nflash.h b/drivers/soc/bl702/std/include/bl702_nflash.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_nflash.h
rename to drivers/soc/bl702/std/include/bl702_nflash.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_pds.h b/drivers/soc/bl702/std/include/bl702_pds.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_pds.h
rename to drivers/soc/bl702/std/include/bl702_pds.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_psram.h b/drivers/soc/bl702/std/include/bl702_psram.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_psram.h
rename to drivers/soc/bl702/std/include/bl702_psram.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_romdriver.h b/drivers/soc/bl702/std/include/bl702_romdriver.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_romdriver.h
rename to drivers/soc/bl702/std/include/bl702_romdriver.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_sf_cfg.h b/drivers/soc/bl702/std/include/bl702_sf_cfg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_sf_cfg.h
rename to drivers/soc/bl702/std/include/bl702_sf_cfg.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_sf_cfg_ext.h b/drivers/soc/bl702/std/include/bl702_sf_cfg_ext.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_sf_cfg_ext.h
rename to drivers/soc/bl702/std/include/bl702_sf_cfg_ext.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_sf_ctrl.h b/drivers/soc/bl702/std/include/bl702_sf_ctrl.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_sf_ctrl.h
rename to drivers/soc/bl702/std/include/bl702_sf_ctrl.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_sflash.h b/drivers/soc/bl702/std/include/bl702_sflash.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_sflash.h
rename to drivers/soc/bl702/std/include/bl702_sflash.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_sflash_ext.h b/drivers/soc/bl702/std/include/bl702_sflash_ext.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_sflash_ext.h
rename to drivers/soc/bl702/std/include/bl702_sflash_ext.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_snflash.h b/drivers/soc/bl702/std/include/bl702_snflash.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_snflash.h
rename to drivers/soc/bl702/std/include/bl702_snflash.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_xip_sflash.h b/drivers/soc/bl702/std/include/bl702_xip_sflash.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_xip_sflash.h
rename to drivers/soc/bl702/std/include/bl702_xip_sflash.h
diff --git a/drivers/soc/bl702/bl702_std/include/bl702_xip_sflash_ext.h b/drivers/soc/bl702/std/include/bl702_xip_sflash_ext.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/bl702_xip_sflash_ext.h
rename to drivers/soc/bl702/std/include/bl702_xip_sflash_ext.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/aon_reg.h b/drivers/soc/bl702/std/include/hardware/aon_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/aon_reg.h
rename to drivers/soc/bl702/std/include/hardware/aon_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/bl702.h b/drivers/soc/bl702/std/include/hardware/bl702.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/bl702.h
rename to drivers/soc/bl702/std/include/hardware/bl702.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/ef_ctrl_reg.h b/drivers/soc/bl702/std/include/hardware/ef_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/ef_ctrl_reg.h
rename to drivers/soc/bl702/std/include/hardware/ef_ctrl_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/ef_data_0_reg.h b/drivers/soc/bl702/std/include/hardware/ef_data_0_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/ef_data_0_reg.h
rename to drivers/soc/bl702/std/include/hardware/ef_data_0_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/ef_data_reg.h b/drivers/soc/bl702/std/include/hardware/ef_data_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/ef_data_reg.h
rename to drivers/soc/bl702/std/include/hardware/ef_data_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/glb_reg.h b/drivers/soc/bl702/std/include/hardware/glb_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/glb_reg.h
rename to drivers/soc/bl702/std/include/hardware/glb_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/gpip_reg.h b/drivers/soc/bl702/std/include/hardware/gpip_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/gpip_reg.h
rename to drivers/soc/bl702/std/include/hardware/gpip_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/hbn_reg.h b/drivers/soc/bl702/std/include/hardware/hbn_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/hbn_reg.h
rename to drivers/soc/bl702/std/include/hardware/hbn_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/l1c_reg.h b/drivers/soc/bl702/std/include/hardware/l1c_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/l1c_reg.h
rename to drivers/soc/bl702/std/include/hardware/l1c_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/pds_reg.h b/drivers/soc/bl702/std/include/hardware/pds_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/pds_reg.h
rename to drivers/soc/bl702/std/include/hardware/pds_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/sf_ctrl_reg.h b/drivers/soc/bl702/std/include/hardware/sf_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/sf_ctrl_reg.h
rename to drivers/soc/bl702/std/include/hardware/sf_ctrl_reg.h
diff --git a/drivers/soc/bl702/bl702_std/include/hardware/tzc_sec_reg.h b/drivers/soc/bl702/std/include/hardware/tzc_sec_reg.h
similarity index 100%
rename from drivers/soc/bl702/bl702_std/include/hardware/tzc_sec_reg.h
rename to drivers/soc/bl702/std/include/hardware/tzc_sec_reg.h
diff --git a/drivers/soc/bl702/port/bl702_clock.c b/drivers/soc/bl702/std/port/bl702_clock.c
similarity index 100%
rename from drivers/soc/bl702/port/bl702_clock.c
rename to drivers/soc/bl702/std/port/bl702_clock.c
diff --git a/drivers/soc/bl702/port/bl702_flash.c b/drivers/soc/bl702/std/port/bl702_flash.c
similarity index 100%
rename from drivers/soc/bl702/port/bl702_flash.c
rename to drivers/soc/bl702/std/port/bl702_flash.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_aon.c b/drivers/soc/bl702/std/src/bl702_aon.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_aon.c
rename to drivers/soc/bl702/std/src/bl702_aon.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_clock.c b/drivers/soc/bl702/std/src/bl702_clock.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_clock.c
rename to drivers/soc/bl702/std/src/bl702_clock.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_common.c b/drivers/soc/bl702/std/src/bl702_common.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_common.c
rename to drivers/soc/bl702/std/src/bl702_common.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_ef_cfg.c b/drivers/soc/bl702/std/src/bl702_ef_cfg.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_ef_cfg.c
rename to drivers/soc/bl702/std/src/bl702_ef_cfg.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_ef_ctrl.c b/drivers/soc/bl702/std/src/bl702_ef_ctrl.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_ef_ctrl.c
rename to drivers/soc/bl702/std/src/bl702_ef_ctrl.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_glb.c b/drivers/soc/bl702/std/src/bl702_glb.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_glb.c
rename to drivers/soc/bl702/std/src/bl702_glb.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_hbn.c b/drivers/soc/bl702/std/src/bl702_hbn.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_hbn.c
rename to drivers/soc/bl702/std/src/bl702_hbn.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_l1c.c b/drivers/soc/bl702/std/src/bl702_l1c.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_l1c.c
rename to drivers/soc/bl702/std/src/bl702_l1c.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_pds.c b/drivers/soc/bl702/std/src/bl702_pds.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_pds.c
rename to drivers/soc/bl702/std/src/bl702_pds.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_psram.c b/drivers/soc/bl702/std/src/bl702_psram.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_psram.c
rename to drivers/soc/bl702/std/src/bl702_psram.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_romapi.c b/drivers/soc/bl702/std/src/bl702_romapi.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_romapi.c
rename to drivers/soc/bl702/std/src/bl702_romapi.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_romdriver.c b/drivers/soc/bl702/std/src/bl702_romdriver.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_romdriver.c
rename to drivers/soc/bl702/std/src/bl702_romdriver.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_sf_cfg.c b/drivers/soc/bl702/std/src/bl702_sf_cfg.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_sf_cfg.c
rename to drivers/soc/bl702/std/src/bl702_sf_cfg.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_sf_cfg_ext.c b/drivers/soc/bl702/std/src/bl702_sf_cfg_ext.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_sf_cfg_ext.c
rename to drivers/soc/bl702/std/src/bl702_sf_cfg_ext.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_sf_ctrl.c b/drivers/soc/bl702/std/src/bl702_sf_ctrl.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_sf_ctrl.c
rename to drivers/soc/bl702/std/src/bl702_sf_ctrl.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_sflash.c b/drivers/soc/bl702/std/src/bl702_sflash.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_sflash.c
rename to drivers/soc/bl702/std/src/bl702_sflash.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_sflash_ext.c b/drivers/soc/bl702/std/src/bl702_sflash_ext.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_sflash_ext.c
rename to drivers/soc/bl702/std/src/bl702_sflash_ext.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_snflash.c b/drivers/soc/bl702/std/src/bl702_snflash.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_snflash.c
rename to drivers/soc/bl702/std/src/bl702_snflash.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_xip_sflash.c b/drivers/soc/bl702/std/src/bl702_xip_sflash.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_xip_sflash.c
rename to drivers/soc/bl702/std/src/bl702_xip_sflash.c
diff --git a/drivers/soc/bl702/bl702_std/src/bl702_xip_sflash_ext.c b/drivers/soc/bl702/std/src/bl702_xip_sflash_ext.c
similarity index 100%
rename from drivers/soc/bl702/bl702_std/src/bl702_xip_sflash_ext.c
rename to drivers/soc/bl702/std/src/bl702_xip_sflash_ext.c
diff --git a/drivers/soc/bl702/startup/interrupt.c b/drivers/soc/bl702/std/startup/interrupt.c
similarity index 100%
rename from drivers/soc/bl702/startup/interrupt.c
rename to drivers/soc/bl702/std/startup/interrupt.c
diff --git a/drivers/soc/bl702/startup/start.S b/drivers/soc/bl702/std/startup/start.S
similarity index 100%
rename from drivers/soc/bl702/startup/start.S
rename to drivers/soc/bl702/std/startup/start.S
diff --git a/drivers/soc/bl702/startup/start_load.c b/drivers/soc/bl702/std/startup/start_load.c
similarity index 100%
rename from drivers/soc/bl702/startup/start_load.c
rename to drivers/soc/bl702/std/startup/start_load.c
diff --git a/drivers/soc/bl702/startup/system_bl702.c b/drivers/soc/bl702/std/startup/system_bl702.c
similarity index 100%
rename from drivers/soc/bl702/startup/system_bl702.c
rename to drivers/soc/bl702/std/startup/system_bl702.c
diff --git a/drivers/soc/bl808/CMakeLists.txt b/drivers/soc/bl808/std/CMakeLists.txt
similarity index 53%
rename from drivers/soc/bl808/CMakeLists.txt
rename to drivers/soc/bl808/std/CMakeLists.txt
index 818f9e62..3bc9f464 100644
--- a/drivers/soc/bl808/CMakeLists.txt
+++ b/drivers/soc/bl808/std/CMakeLists.txt
@@ -7,31 +7,32 @@ sdk_library_add_sources(startup/${CPU_ID}/start_load.c)
 sdk_library_add_sources(startup/${CPU_ID}/system_bl808.c)
 sdk_library_add_sources(startup/${CPU_ID}/interrupt.c)
 
-sdk_library_add_sources(bl808_std/src/bl808_aon.c)
-sdk_library_add_sources(bl808_std/src/bl808_clock.c)
-sdk_library_add_sources(bl808_std/src/bl808_common.c)
-sdk_library_add_sources(bl808_std/src/bl808_ef_cfg.c)
-sdk_library_add_sources(bl808_std/src/bl808_glb.c)
-sdk_library_add_sources(bl808_std/src/bl808_hbn.c)
-sdk_library_add_sources(bl808_std/src/bl808_l1c.c)
-sdk_library_add_sources(bl808_std/src/bl808_pds.c)
-sdk_library_add_sources(bl808_std/src/bl808_sdh.c)
+sdk_library_add_sources(src/bl808_aon.c)
+sdk_library_add_sources(src/bl808_clock.c)
+sdk_library_add_sources(src/bl808_common.c)
+sdk_library_add_sources(src/bl808_ef_cfg.c)
+sdk_library_add_sources(src/bl808_glb.c)
+sdk_library_add_sources(src/bl808_glb_gpio.c)
+sdk_library_add_sources(src/bl808_hbn.c)
+sdk_library_add_sources(src/bl808_l1c.c)
+sdk_library_add_sources(src/bl808_pds.c)
+sdk_library_add_sources(src/bl808_sdh.c)
 
-sdk_library_add_sources(bl808_std/src/bl808_tzc_sec.c)
-sdk_library_add_sources(bl808_std/src/bl808_psram_uhs.c)
-sdk_library_add_sources(bl808_std/src/bl808_uhs_phy.c)
+sdk_library_add_sources(src/bl808_tzc_sec.c)
+sdk_library_add_sources(src/bl808_psram_uhs.c)
+sdk_library_add_sources(src/bl808_uhs_phy.c)
 
-sdk_library_add_sources(bl808_std/src/bl808_sf_cfg.c)
-sdk_library_add_sources(bl808_std/src/bl808_sf_ctrl.c)
-sdk_library_add_sources(bl808_std/src/bl808_sflash.c)
-sdk_library_add_sources(bl808_std/src/bl808_xip_sflash.c)
+sdk_library_add_sources(src/bl808_sf_cfg.c)
+sdk_library_add_sources(src/bl808_sf_ctrl.c)
+sdk_library_add_sources(src/bl808_sflash.c)
+sdk_library_add_sources(src/bl808_xip_sflash.c)
 
 sdk_library_add_sources(port/bl808_clock.c)
 sdk_library_add_sources(port/bl808_flash.c)
 
 sdk_add_include_directories(
-bl808_std/include
-bl808_std/include/hardware
+include
+include/hardware
 )
 
 if("${CPU_ID}" STREQUAL "m0")
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_aon.h b/drivers/soc/bl808/std/include/bl808_aon.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_aon.h
rename to drivers/soc/bl808/std/include/bl808_aon.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_clock.h b/drivers/soc/bl808/std/include/bl808_clock.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_clock.h
rename to drivers/soc/bl808/std/include/bl808_clock.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_common.h b/drivers/soc/bl808/std/include/bl808_common.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_common.h
rename to drivers/soc/bl808/std/include/bl808_common.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_ef_cfg.h b/drivers/soc/bl808/std/include/bl808_ef_cfg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_ef_cfg.h
rename to drivers/soc/bl808/std/include/bl808_ef_cfg.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_ef_ctrl.h b/drivers/soc/bl808/std/include/bl808_ef_ctrl.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_ef_ctrl.h
rename to drivers/soc/bl808/std/include/bl808_ef_ctrl.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_glb.h b/drivers/soc/bl808/std/include/bl808_glb.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_glb.h
rename to drivers/soc/bl808/std/include/bl808_glb.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_glb_gpio.h b/drivers/soc/bl808/std/include/bl808_glb_gpio.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_glb_gpio.h
rename to drivers/soc/bl808/std/include/bl808_glb_gpio.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_gpio.h b/drivers/soc/bl808/std/include/bl808_gpio.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_gpio.h
rename to drivers/soc/bl808/std/include/bl808_gpio.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_hbn.h b/drivers/soc/bl808/std/include/bl808_hbn.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_hbn.h
rename to drivers/soc/bl808/std/include/bl808_hbn.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_ipc.h b/drivers/soc/bl808/std/include/bl808_ipc.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_ipc.h
rename to drivers/soc/bl808/std/include/bl808_ipc.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_l1c.h b/drivers/soc/bl808/std/include/bl808_l1c.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_l1c.h
rename to drivers/soc/bl808/std/include/bl808_l1c.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_pds.h b/drivers/soc/bl808/std/include/bl808_pds.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_pds.h
rename to drivers/soc/bl808/std/include/bl808_pds.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_psram.h b/drivers/soc/bl808/std/include/bl808_psram.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_psram.h
rename to drivers/soc/bl808/std/include/bl808_psram.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_psram_uhs.h b/drivers/soc/bl808/std/include/bl808_psram_uhs.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_psram_uhs.h
rename to drivers/soc/bl808/std/include/bl808_psram_uhs.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_sdh.h b/drivers/soc/bl808/std/include/bl808_sdh.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_sdh.h
rename to drivers/soc/bl808/std/include/bl808_sdh.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_sf_cfg.h b/drivers/soc/bl808/std/include/bl808_sf_cfg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_sf_cfg.h
rename to drivers/soc/bl808/std/include/bl808_sf_cfg.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_sf_ctrl.h b/drivers/soc/bl808/std/include/bl808_sf_ctrl.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_sf_ctrl.h
rename to drivers/soc/bl808/std/include/bl808_sf_ctrl.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_sflash.h b/drivers/soc/bl808/std/include/bl808_sflash.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_sflash.h
rename to drivers/soc/bl808/std/include/bl808_sflash.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_tzc_sec.h b/drivers/soc/bl808/std/include/bl808_tzc_sec.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_tzc_sec.h
rename to drivers/soc/bl808/std/include/bl808_tzc_sec.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_uhs_phy.h b/drivers/soc/bl808/std/include/bl808_uhs_phy.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_uhs_phy.h
rename to drivers/soc/bl808/std/include/bl808_uhs_phy.h
diff --git a/drivers/soc/bl808/bl808_std/include/bl808_xip_sflash.h b/drivers/soc/bl808/std/include/bl808_xip_sflash.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/bl808_xip_sflash.h
rename to drivers/soc/bl808/std/include/bl808_xip_sflash.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/aon_reg.h b/drivers/soc/bl808/std/include/hardware/aon_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/aon_reg.h
rename to drivers/soc/bl808/std/include/hardware/aon_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/bl808.h b/drivers/soc/bl808/std/include/hardware/bl808.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/bl808.h
rename to drivers/soc/bl808/std/include/hardware/bl808.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/cci_reg.h b/drivers/soc/bl808/std/include/hardware/cci_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/cci_reg.h
rename to drivers/soc/bl808/std/include/hardware/cci_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/codec_misc_reg.h b/drivers/soc/bl808/std/include/hardware/codec_misc_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/codec_misc_reg.h
rename to drivers/soc/bl808/std/include/hardware/codec_misc_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/dtsrc_reg.h b/drivers/soc/bl808/std/include/hardware/dtsrc_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/dtsrc_reg.h
rename to drivers/soc/bl808/std/include/hardware/dtsrc_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/ef_ctrl_reg.h b/drivers/soc/bl808/std/include/hardware/ef_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/ef_ctrl_reg.h
rename to drivers/soc/bl808/std/include/hardware/ef_ctrl_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/ef_data_0_reg.h b/drivers/soc/bl808/std/include/hardware/ef_data_0_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/ef_data_0_reg.h
rename to drivers/soc/bl808/std/include/hardware/ef_data_0_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/ef_data_1_reg.h b/drivers/soc/bl808/std/include/hardware/ef_data_1_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/ef_data_1_reg.h
rename to drivers/soc/bl808/std/include/hardware/ef_data_1_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/glb_reg.h b/drivers/soc/bl808/std/include/hardware/glb_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/glb_reg.h
rename to drivers/soc/bl808/std/include/hardware/glb_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/gpip_reg.h b/drivers/soc/bl808/std/include/hardware/gpip_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/gpip_reg.h
rename to drivers/soc/bl808/std/include/hardware/gpip_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/hbn_reg.h b/drivers/soc/bl808/std/include/hardware/hbn_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/hbn_reg.h
rename to drivers/soc/bl808/std/include/hardware/hbn_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/ipc_reg.h b/drivers/soc/bl808/std/include/hardware/ipc_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/ipc_reg.h
rename to drivers/soc/bl808/std/include/hardware/ipc_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/mcu_misc_reg.h b/drivers/soc/bl808/std/include/hardware/mcu_misc_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/mcu_misc_reg.h
rename to drivers/soc/bl808/std/include/hardware/mcu_misc_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/mm_glb_reg.h b/drivers/soc/bl808/std/include/hardware/mm_glb_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/mm_glb_reg.h
rename to drivers/soc/bl808/std/include/hardware/mm_glb_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/mm_misc_reg.h b/drivers/soc/bl808/std/include/hardware/mm_misc_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/mm_misc_reg.h
rename to drivers/soc/bl808/std/include/hardware/mm_misc_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/pds_reg.h b/drivers/soc/bl808/std/include/hardware/pds_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/pds_reg.h
rename to drivers/soc/bl808/std/include/hardware/pds_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/psram_reg.h b/drivers/soc/bl808/std/include/hardware/psram_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/psram_reg.h
rename to drivers/soc/bl808/std/include/hardware/psram_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/psram_uhs_reg.h b/drivers/soc/bl808/std/include/hardware/psram_uhs_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/psram_uhs_reg.h
rename to drivers/soc/bl808/std/include/hardware/psram_uhs_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/sdh_reg.h b/drivers/soc/bl808/std/include/hardware/sdh_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/sdh_reg.h
rename to drivers/soc/bl808/std/include/hardware/sdh_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/sf_ctrl_reg.h b/drivers/soc/bl808/std/include/hardware/sf_ctrl_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/sf_ctrl_reg.h
rename to drivers/soc/bl808/std/include/hardware/sf_ctrl_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/tzc_nsec_reg.h b/drivers/soc/bl808/std/include/hardware/tzc_nsec_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/tzc_nsec_reg.h
rename to drivers/soc/bl808/std/include/hardware/tzc_nsec_reg.h
diff --git a/drivers/soc/bl808/bl808_std/include/hardware/tzc_sec_reg.h b/drivers/soc/bl808/std/include/hardware/tzc_sec_reg.h
similarity index 100%
rename from drivers/soc/bl808/bl808_std/include/hardware/tzc_sec_reg.h
rename to drivers/soc/bl808/std/include/hardware/tzc_sec_reg.h
diff --git a/drivers/soc/bl808/port/bl808_clock.c b/drivers/soc/bl808/std/port/bl808_clock.c
similarity index 100%
rename from drivers/soc/bl808/port/bl808_clock.c
rename to drivers/soc/bl808/std/port/bl808_clock.c
diff --git a/drivers/soc/bl808/port/bl808_flash.c b/drivers/soc/bl808/std/port/bl808_flash.c
similarity index 100%
rename from drivers/soc/bl808/port/bl808_flash.c
rename to drivers/soc/bl808/std/port/bl808_flash.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_aon.c b/drivers/soc/bl808/std/src/bl808_aon.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_aon.c
rename to drivers/soc/bl808/std/src/bl808_aon.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_clock.c b/drivers/soc/bl808/std/src/bl808_clock.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_clock.c
rename to drivers/soc/bl808/std/src/bl808_clock.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_common.c b/drivers/soc/bl808/std/src/bl808_common.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_common.c
rename to drivers/soc/bl808/std/src/bl808_common.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_ef_cfg.c b/drivers/soc/bl808/std/src/bl808_ef_cfg.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_ef_cfg.c
rename to drivers/soc/bl808/std/src/bl808_ef_cfg.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_ef_ctrl.c b/drivers/soc/bl808/std/src/bl808_ef_ctrl.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_ef_ctrl.c
rename to drivers/soc/bl808/std/src/bl808_ef_ctrl.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_glb.c b/drivers/soc/bl808/std/src/bl808_glb.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_glb.c
rename to drivers/soc/bl808/std/src/bl808_glb.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_glb_gpio.c b/drivers/soc/bl808/std/src/bl808_glb_gpio.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_glb_gpio.c
rename to drivers/soc/bl808/std/src/bl808_glb_gpio.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_hbn.c b/drivers/soc/bl808/std/src/bl808_hbn.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_hbn.c
rename to drivers/soc/bl808/std/src/bl808_hbn.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_l1c.c b/drivers/soc/bl808/std/src/bl808_l1c.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_l1c.c
rename to drivers/soc/bl808/std/src/bl808_l1c.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_pds.c b/drivers/soc/bl808/std/src/bl808_pds.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_pds.c
rename to drivers/soc/bl808/std/src/bl808_pds.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_psram_uhs.c b/drivers/soc/bl808/std/src/bl808_psram_uhs.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_psram_uhs.c
rename to drivers/soc/bl808/std/src/bl808_psram_uhs.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_sdh.c b/drivers/soc/bl808/std/src/bl808_sdh.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_sdh.c
rename to drivers/soc/bl808/std/src/bl808_sdh.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_sf_cfg.c b/drivers/soc/bl808/std/src/bl808_sf_cfg.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_sf_cfg.c
rename to drivers/soc/bl808/std/src/bl808_sf_cfg.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_sf_ctrl.c b/drivers/soc/bl808/std/src/bl808_sf_ctrl.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_sf_ctrl.c
rename to drivers/soc/bl808/std/src/bl808_sf_ctrl.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_sflash.c b/drivers/soc/bl808/std/src/bl808_sflash.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_sflash.c
rename to drivers/soc/bl808/std/src/bl808_sflash.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_tzc_sec.c b/drivers/soc/bl808/std/src/bl808_tzc_sec.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_tzc_sec.c
rename to drivers/soc/bl808/std/src/bl808_tzc_sec.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_uhs_phy.c b/drivers/soc/bl808/std/src/bl808_uhs_phy.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_uhs_phy.c
rename to drivers/soc/bl808/std/src/bl808_uhs_phy.c
diff --git a/drivers/soc/bl808/bl808_std/src/bl808_xip_sflash.c b/drivers/soc/bl808/std/src/bl808_xip_sflash.c
similarity index 100%
rename from drivers/soc/bl808/bl808_std/src/bl808_xip_sflash.c
rename to drivers/soc/bl808/std/src/bl808_xip_sflash.c
diff --git a/drivers/soc/bl808/startup/d0/interrupt.c b/drivers/soc/bl808/std/startup/d0/interrupt.c
similarity index 100%
rename from drivers/soc/bl808/startup/d0/interrupt.c
rename to drivers/soc/bl808/std/startup/d0/interrupt.c
diff --git a/drivers/soc/bl808/startup/d0/irq_ctx.h b/drivers/soc/bl808/std/startup/d0/irq_ctx.h
similarity index 100%
rename from drivers/soc/bl808/startup/d0/irq_ctx.h
rename to drivers/soc/bl808/std/startup/d0/irq_ctx.h
diff --git a/drivers/soc/bl808/startup/d0/riscv_fpu.S b/drivers/soc/bl808/std/startup/d0/riscv_fpu.S
similarity index 100%
rename from drivers/soc/bl808/startup/d0/riscv_fpu.S
rename to drivers/soc/bl808/std/startup/d0/riscv_fpu.S
diff --git a/drivers/soc/bl808/startup/d0/start.S b/drivers/soc/bl808/std/startup/d0/start.S
similarity index 100%
rename from drivers/soc/bl808/startup/d0/start.S
rename to drivers/soc/bl808/std/startup/d0/start.S
diff --git a/drivers/soc/bl808/startup/d0/start_load.c b/drivers/soc/bl808/std/startup/d0/start_load.c
similarity index 100%
rename from drivers/soc/bl808/startup/d0/start_load.c
rename to drivers/soc/bl808/std/startup/d0/start_load.c
diff --git a/drivers/soc/bl808/startup/d0/system_bl808.c b/drivers/soc/bl808/std/startup/d0/system_bl808.c
similarity index 100%
rename from drivers/soc/bl808/startup/d0/system_bl808.c
rename to drivers/soc/bl808/std/startup/d0/system_bl808.c
diff --git a/drivers/soc/bl808/startup/d0/vector.S b/drivers/soc/bl808/std/startup/d0/vector.S
similarity index 100%
rename from drivers/soc/bl808/startup/d0/vector.S
rename to drivers/soc/bl808/std/startup/d0/vector.S
diff --git a/drivers/soc/bl808/startup/m0/interrupt.c b/drivers/soc/bl808/std/startup/m0/interrupt.c
similarity index 100%
rename from drivers/soc/bl808/startup/m0/interrupt.c
rename to drivers/soc/bl808/std/startup/m0/interrupt.c
diff --git a/drivers/soc/bl808/startup/m0/irq_ctx.h b/drivers/soc/bl808/std/startup/m0/irq_ctx.h
similarity index 100%
rename from drivers/soc/bl808/startup/m0/irq_ctx.h
rename to drivers/soc/bl808/std/startup/m0/irq_ctx.h
diff --git a/drivers/soc/bl808/startup/m0/riscv_fpu.S b/drivers/soc/bl808/std/startup/m0/riscv_fpu.S
similarity index 100%
rename from drivers/soc/bl808/startup/m0/riscv_fpu.S
rename to drivers/soc/bl808/std/startup/m0/riscv_fpu.S
diff --git a/drivers/soc/bl808/startup/m0/start.S b/drivers/soc/bl808/std/startup/m0/start.S
similarity index 100%
rename from drivers/soc/bl808/startup/m0/start.S
rename to drivers/soc/bl808/std/startup/m0/start.S
diff --git a/drivers/soc/bl808/startup/m0/start_load.c b/drivers/soc/bl808/std/startup/m0/start_load.c
similarity index 100%
rename from drivers/soc/bl808/startup/m0/start_load.c
rename to drivers/soc/bl808/std/startup/m0/start_load.c
diff --git a/drivers/soc/bl808/startup/m0/system_bl808.c b/drivers/soc/bl808/std/startup/m0/system_bl808.c
similarity index 100%
rename from drivers/soc/bl808/startup/m0/system_bl808.c
rename to drivers/soc/bl808/std/startup/m0/system_bl808.c
diff --git a/drivers/soc/bl808/startup/m0/vector.S b/drivers/soc/bl808/std/startup/m0/vector.S
similarity index 100%
rename from drivers/soc/bl808/startup/m0/vector.S
rename to drivers/soc/bl808/std/startup/m0/vector.S