From 772553501e016d92b73edbf5baa1166894722b1c Mon Sep 17 00:00:00 2001
From: CYFS <2805686936@qq.com>
Date: Tue, 7 Jul 2026 18:00:50 +0800
Subject: [PATCH] bsp: update renesas MDK5 projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

同步 Renesas BSP 的 MDK5 工程生成方式，移除对 RASC gpdsc/build hook 的依赖，并更新由 scons 生成的 Keil 工程。

已保留存在实际 via 文件的 BSP 配置，仅移除缺失 via 文件的引用。
---
 bsp/renesas/ebf_qi_min_6m5/SConscript         |   5 +-
 bsp/renesas/ebf_qi_min_6m5/buildinfo.gpdsc    | 140 ---------
 bsp/renesas/ebf_qi_min_6m5/project.uvprojx    | 171 +++++++++-
 bsp/renesas/ebf_qi_min_6m5/ra/SConscript      |  17 +-
 bsp/renesas/ebf_qi_min_6m5/ra_cfg/SConscript  |   5 +-
 bsp/renesas/ebf_qi_min_6m5/ra_gen/SConscript  |   5 +-
 bsp/renesas/ebf_qi_min_6m5/template.uvprojx   |  11 +-
 bsp/renesas/libraries/bsp-template/SConscript |   5 +-
 .../libraries/bsp-template/ra/SConscript      |  17 +-
 .../libraries/bsp-template/ra_cfg/SConscript  |   5 +-
 .../libraries/bsp-template/ra_gen/SConscript  |   5 +-
 bsp/renesas/ra2a1-ek/EventRecorderStub.scvd   |   9 -
 bsp/renesas/ra2a1-ek/SConscript               |   3 +-
 bsp/renesas/ra2a1-ek/buildinfo.gpdsc          | 183 -----------
 bsp/renesas/ra2a1-ek/project.uvprojx          | 188 ++++++++++-
 bsp/renesas/ra2a1-ek/ra/SConscript            |  19 +-
 bsp/renesas/ra2a1-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra2a1-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra2a1-ek/template.uvprojx         |   7 -
 bsp/renesas/ra2e2-ek/SConscript               |   3 +-
 bsp/renesas/ra2e2-ek/buildinfo.gpdsc          | 164 ----------
 bsp/renesas/ra2e2-ek/project.uvprojx          | 192 +++++++++++-
 bsp/renesas/ra2e2-ek/ra/SConscript            |  19 +-
 bsp/renesas/ra2e2-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra2e2-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra2e2-ek/template.uvprojx         |  11 +-
 bsp/renesas/ra2l1-cpk/SConscript              |   5 +-
 bsp/renesas/ra2l1-cpk/buildinfo.gpdsc         | 161 ----------
 bsp/renesas/ra2l1-cpk/project.uvprojx         | 167 +++++++++-
 bsp/renesas/ra2l1-cpk/ra/SConscript           |  17 +-
 bsp/renesas/ra2l1-cpk/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra2l1-cpk/template.uvprojx        |   7 -
 bsp/renesas/ra4e2-eco/SConscript              |   5 +-
 bsp/renesas/ra4e2-eco/buildinfo.gpdsc         | 182 -----------
 bsp/renesas/ra4e2-eco/project.uvprojx         | 187 ++++++++++-
 bsp/renesas/ra4e2-eco/ra/SConscript           |  17 +-
 bsp/renesas/ra4e2-eco/ra_cfg/SConscript       |   5 +-
 bsp/renesas/ra4e2-eco/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra4e2-eco/template.uvprojx        |  15 +-
 bsp/renesas/ra4e2-ek/SConscript               |   5 +-
 bsp/renesas/ra4e2-ek/board/ports/SConscript   |   2 +-
 bsp/renesas/ra4e2-ek/buildinfo.gpdsc          | 164 ----------
 bsp/renesas/ra4e2-ek/project.uvprojx          | 200 +++++++++++-
 bsp/renesas/ra4e2-ek/ra/SConscript            |  18 +-
 bsp/renesas/ra4e2-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra4e2-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra4e2-ek/template.uvprojx         |  21 +-
 bsp/renesas/ra4m1-ek/SConscript               |   3 +-
 bsp/renesas/ra4m1-ek/buildinfo.gpdsc          | 171 ----------
 bsp/renesas/ra4m1-ek/project.uvprojx          | 235 ++++++++++++--
 bsp/renesas/ra4m1-ek/ra/SConscript            |  19 +-
 bsp/renesas/ra4m1-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra4m1-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra4m1-ek/template.uvprojx         |   9 +-
 bsp/renesas/ra4m2-eco/SConscript              |   7 +-
 bsp/renesas/ra4m2-eco/buildinfo.gpdsc         | 157 ----------
 bsp/renesas/ra4m2-eco/project.uvprojx         | 169 +++++++++-
 bsp/renesas/ra4m2-eco/ra/SConscript           |  17 +-
 bsp/renesas/ra4m2-eco/ra_cfg/SConscript       |   5 +-
 bsp/renesas/ra4m2-eco/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra4m2-eco/template.uvprojx        |   9 +-
 bsp/renesas/ra6e2-ek/SConscript               |   5 +-
 bsp/renesas/ra6e2-ek/buildinfo.gpdsc          | 162 ----------
 bsp/renesas/ra6e2-ek/project.uvprojx          | 183 ++++++++++-
 bsp/renesas/ra6e2-ek/ra/SConscript            |  17 +-
 bsp/renesas/ra6e2-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra6e2-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra6e2-ek/template.uvprojx         |  11 +-
 bsp/renesas/ra6e2-fpb/EventRecorderStub.scvd  |   9 -
 bsp/renesas/ra6e2-fpb/SConscript              |   5 +-
 bsp/renesas/ra6e2-fpb/buildinfo.gpdsc         | 162 ----------
 bsp/renesas/ra6e2-fpb/project.uvprojx         | 183 ++++++++++-
 bsp/renesas/ra6e2-fpb/ra/SConscript           |  17 +-
 bsp/renesas/ra6e2-fpb/ra_cfg/SConscript       |   5 +-
 bsp/renesas/ra6e2-fpb/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra6e2-fpb/template.uvprojx        |  11 +-
 bsp/renesas/ra6m3-ek/SConscript               |   5 +-
 bsp/renesas/ra6m3-ek/buildinfo.gpdsc          | 157 ----------
 bsp/renesas/ra6m3-ek/project.uvprojx          | 169 +++++++++-
 bsp/renesas/ra6m3-ek/ra/SConscript            |  17 +-
 bsp/renesas/ra6m3-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra6m3-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra6m3-ek/template.uvprojx         |   9 +-
 bsp/renesas/ra6m3-hmi-board/SConscript        |   5 +-
 bsp/renesas/ra6m3-hmi-board/buildinfo.gpdsc   | 141 ---------
 bsp/renesas/ra6m3-hmi-board/project.uvprojx   | 169 +++++++++-
 bsp/renesas/ra6m3-hmi-board/ra/SConscript     |  25 +-
 bsp/renesas/ra6m3-hmi-board/ra_cfg/SConscript |   5 +-
 bsp/renesas/ra6m3-hmi-board/ra_gen/SConscript |   5 +-
 bsp/renesas/ra6m3-hmi-board/template.uvprojx  |   9 +-
 bsp/renesas/ra6m4-cpk/SConscript              |   5 +-
 bsp/renesas/ra6m4-cpk/buildinfo.gpdsc         | 142 ---------
 bsp/renesas/ra6m4-cpk/project.uvprojx         | 169 +++++++++-
 bsp/renesas/ra6m4-cpk/ra/SConscript           |  17 +-
 bsp/renesas/ra6m4-cpk/ra_cfg/SConscript       |   5 +-
 bsp/renesas/ra6m4-cpk/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra6m4-cpk/template.uvprojx        |   9 +-
 bsp/renesas/ra6m4-iot/SConscript              |   5 +-
 bsp/renesas/ra6m4-iot/buildinfo.gpdsc         | 146 ---------
 bsp/renesas/ra6m4-iot/project.uvprojx         | 169 +++++++++-
 bsp/renesas/ra6m4-iot/ra/SConscript           |  17 +-
 bsp/renesas/ra6m4-iot/ra_cfg/SConscript       |   5 +-
 bsp/renesas/ra6m4-iot/ra_gen/SConscript       |   5 +-
 bsp/renesas/ra6m4-iot/template.uvprojx        |   9 +-
 bsp/renesas/ra8d1-ek/SConscript               |   5 +-
 bsp/renesas/ra8d1-ek/buildinfo.gpdsc          | 149 ---------
 bsp/renesas/ra8d1-ek/project.uvprojx          | 169 +++++++++-
 bsp/renesas/ra8d1-ek/ra/SConscript            |  17 +-
 bsp/renesas/ra8d1-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra8d1-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra8d1-ek/template.uvprojx         |   9 +-
 bsp/renesas/ra8d1-vision-board/SConscript     |   5 +-
 .../ra8d1-vision-board/buildinfo.gpdsc        | 149 ---------
 .../ra8d1-vision-board/project.uvprojx        | 169 +++++++++-
 bsp/renesas/ra8d1-vision-board/ra/SConscript  |  17 +-
 .../ra8d1-vision-board/ra_cfg/SConscript      |   5 +-
 .../ra8d1-vision-board/ra_gen/SConscript      |   5 +-
 .../ra8d1-vision-board/template.uvprojx       |   9 +-
 bsp/renesas/ra8m1-ek/SConscript               |   5 +-
 bsp/renesas/ra8m1-ek/buildinfo.gpdsc          | 161 ----------
 bsp/renesas/ra8m1-ek/project.uvprojx          | 171 +++++++++-
 bsp/renesas/ra8m1-ek/ra/SConscript            |  17 +-
 bsp/renesas/ra8m1-ek/ra_cfg/SConscript        |   5 +-
 bsp/renesas/ra8m1-ek/ra_gen/SConscript        |   5 +-
 bsp/renesas/ra8m1-ek/template.uvprojx         |  11 +-
 bsp/renesas/ra8p1-titan-board/SConscript      |   5 +-
 bsp/renesas/ra8p1-titan-board/buildinfo.gpdsc | 157 ----------
 bsp/renesas/ra8p1-titan-board/project.uvprojx | 291 +++++++++++++++++-
 bsp/renesas/ra8p1-titan-board/ra/SConscript   |  35 +--
 .../ra8p1-titan-board/ra_cfg/SConscript       |   5 +-
 .../ra8p1-titan-board/ra_gen/SConscript       |   5 +-
 .../ra8p1-titan-board/template.uvprojx        |  21 +-
 bsp/renesas/rzn2l_etherkit/SConscript         |   7 +-
 bsp/renesas/rzn2l_etherkit/rzn/SConscript     |  21 +-
 bsp/renesas/rzn2l_etherkit/rzn_cfg/SConscript |   5 +-
 bsp/renesas/rzn2l_etherkit/rzn_gen/SConscript |   5 +-
 bsp/renesas/rzn2l_rsk/SConscript              |   7 +-
 bsp/renesas/rzn2l_rsk/rzn/SConscript          |  21 +-
 bsp/renesas/rzn2l_rsk/rzn_cfg/SConscript      |   5 +-
 bsp/renesas/rzn2l_rsk/rzn_gen/SConscript      |   5 +-
 bsp/renesas/rzt2m_rsk/SConscript              |   5 +-
 bsp/renesas/rzt2m_rsk/rzt/SConscript          |  23 +-
 bsp/renesas/rzt2m_rsk/rzt_cfg/SConscript      |   5 +-
 bsp/renesas/rzt2m_rsk/rzt_gen/SConscript      |   5 +-
 144 files changed, 3506 insertions(+), 3657 deletions(-)
 delete mode 100644 bsp/renesas/ebf_qi_min_6m5/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra2a1-ek/EventRecorderStub.scvd
 delete mode 100644 bsp/renesas/ra2a1-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra2e2-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra2l1-cpk/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra4e2-eco/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra4e2-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra4m1-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra4m2-eco/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6e2-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6e2-fpb/EventRecorderStub.scvd
 delete mode 100644 bsp/renesas/ra6e2-fpb/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6m3-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6m3-hmi-board/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra6m4-iot/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra8d1-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra8d1-vision-board/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra8m1-ek/buildinfo.gpdsc
 delete mode 100644 bsp/renesas/ra8p1-titan-board/buildinfo.gpdsc

diff --git a/bsp/renesas/ebf_qi_min_6m5/SConscript b/bsp/renesas/ebf_qi_min_6m5/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ebf_qi_min_6m5/SConscript
+++ b/bsp/renesas/ebf_qi_min_6m5/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ebf_qi_min_6m5/buildinfo.gpdsc b/bsp/renesas/ebf_qi_min_6m5/buildinfo.gpdsc
deleted file mode 100644
index d18df28cb00..00000000000
--- a/bsp/renesas/ebf_qi_min_6m5/buildinfo.gpdsc
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6M5BH.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m5/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m5/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m5/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ebf_qi_min_6m5/project.uvprojx b/bsp/renesas/ebf_qi_min_6m5/project.uvprojx
index b8d5effda4c..a4db39901fa 100644
--- a/bsp/renesas/ebf_qi_min_6m5/project.uvprojx
+++ b/bsp/renesas/ebf_qi_min_6m5/project.uvprojx
@@ -76,9 +76,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -333,9 +333,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wunused -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__RTTHREAD__, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, __STDC_LIMIT_MACROS</Define>
+              <Define>__RTTHREAD__, RT_USING_LIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension;.;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board\ports;..\..\..\include;..\..\..\components\drivers\smp_call;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\net\utest;board;..\..\..\components\drivers\phy;..\..\..\components\libc\posix\ipc;..\..\..\components\finsh</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;..\..\..\components\net\utest;..\..\..\libcpu\arm\common;ra\fsp\inc\api;ra_cfg\fsp_cfg;board;.;ra_cfg\fsp_cfg\bsp;ra_gen;..\..\..\libcpu\arm\cortex-m4;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;ra\arm\CMSIS_5\CMSIS\Core\Include;..\..\..\components\finsh;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\smp_call;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\phy;ra\fsp\inc\instances;..\..\..\components\libc\posix\io\epoll;ra\fsp\inc;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\poll</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -376,6 +376,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1099,17 +1109,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ebf_qi_min_6m5/ra/SConscript b/bsp/renesas/ebf_qi_min_6m5/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ebf_qi_min_6m5/ra/SConscript
+++ b/bsp/renesas/ebf_qi_min_6m5/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ebf_qi_min_6m5/ra_cfg/SConscript b/bsp/renesas/ebf_qi_min_6m5/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ebf_qi_min_6m5/ra_cfg/SConscript
+++ b/bsp/renesas/ebf_qi_min_6m5/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ebf_qi_min_6m5/ra_gen/SConscript b/bsp/renesas/ebf_qi_min_6m5/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ebf_qi_min_6m5/ra_gen/SConscript
+++ b/bsp/renesas/ebf_qi_min_6m5/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ebf_qi_min_6m5/template.uvprojx b/bsp/renesas/ebf_qi_min_6m5/template.uvprojx
index b67c286e2ba..ee8bbcc8644 100644
--- a/bsp/renesas/ebf_qi_min_6m5/template.uvprojx
+++ b/bsp/renesas/ebf_qi_min_6m5/template.uvprojx
@@ -79,9 +79,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -400,13 +400,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/libraries/bsp-template/SConscript b/bsp/renesas/libraries/bsp-template/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/libraries/bsp-template/SConscript
+++ b/bsp/renesas/libraries/bsp-template/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/libraries/bsp-template/ra/SConscript b/bsp/renesas/libraries/bsp-template/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/libraries/bsp-template/ra/SConscript
+++ b/bsp/renesas/libraries/bsp-template/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript
+++ b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript
+++ b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2a1-ek/EventRecorderStub.scvd b/bsp/renesas/ra2a1-ek/EventRecorderStub.scvd
deleted file mode 100644
index 2956b296838..00000000000
--- a/bsp/renesas/ra2a1-ek/EventRecorderStub.scvd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
-
-<component name="EventRecorderStub" version="1.0.0"/>       <!--name and version of the component-->
-  <events>
-  </events>
-
-</component_viewer>
diff --git a/bsp/renesas/ra2a1-ek/SConscript b/bsp/renesas/ra2a1-ek/SConscript
index a92456b49ca..124c7eca3f4 100644
--- a/bsp/renesas/ra2a1-ek/SConscript
+++ b/bsp/renesas/ra2a1-ek/SConscript
@@ -13,8 +13,7 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('./src/*.c')
+    src = Glob('./src/*.c')
 
 if rtconfig.PLATFORM in ['armclang']:
     CPPPATH = [cwd + '/script/bsp_link/Keil']
diff --git a/bsp/renesas/ra2a1-ek/buildinfo.gpdsc b/bsp/renesas/ra2a1-ek/buildinfo.gpdsc
deleted file mode 100644
index f173b535170..00000000000
--- a/bsp/renesas/ra2a1-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra2a1_ek/board.h" path=""/>
-        <file category="source" name="ra/board/ra2a1_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra2a1_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra2a1_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra2a1_ek/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA2A1AB.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_macl.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_feature.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_linker.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_linker.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_override.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2a1/bsp_peripheral.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_uart/r_sci_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_ofs_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra2a1-ek/project.uvprojx b/bsp/renesas/ra2a1-ek/project.uvprojx
index 0b7bc9aca42..f796d05871a 100644
--- a/bsp/renesas/ra2a1-ek/project.uvprojx
+++ b/bsp/renesas/ra2a1-ek/project.uvprojx
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-ffunction-sections -Wno-license-management -Wunused -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal -Wno-unused-but-set-variable -Wno-implicit-function-declaration -Wno-deprecated-non-prototype -Wno-int-conversion -Oz -D_RENESAS_RA_ -D_RA_CORE=CM23 -D_RA_ORDINAL=1</MiscControls>
-              <Define>__STDC_LIMIT_MACROS, RT_USING_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC</Define>
+              <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;board;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;.;..\..\..\components\libc\posix\io\epoll;..\..\..\components\finsh;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\eventfd;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\phy;script\bsp_link\Keil;..\..\..\include;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\cortex-m23;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\net\utest;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>script\bsp_link\Keil;board\ports;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\epoll;ra\fsp\inc\instances;..\..\..\components\drivers\include;ra\fsp\inc;..\..\..\components\libc\compilers\common\extension;ra_cfg\fsp_cfg\bsp;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers\drivers\config;ra_cfg\fsp_cfg;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;ra\fsp\inc\api;ra_gen;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\libcpu\arm\cortex-m23;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;board;..\..\..\components\drivers\include;.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\poll</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1101,17 +1111,177 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ipc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ipc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_linker.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\ra2a1\bsp_linker.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra2a1-ek/ra/SConscript b/bsp/renesas/ra2a1-ek/ra/SConscript
index 4bed93bc2e5..9dcfaf0021b 100644
--- a/bsp/renesas/ra2a1-ek/ra/SConscript
+++ b/bsp/renesas/ra2a1-ek/ra/SConscript
@@ -11,16 +11,15 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += Glob(cwd + '/fsp/src/bsp/mcu/ra2a1/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/mcu/ra2a1/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2a1-ek/ra_cfg/SConscript b/bsp/renesas/ra2a1-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra2a1-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra2a1-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2a1-ek/ra_gen/SConscript b/bsp/renesas/ra2a1-ek/ra_gen/SConscript
index 3e7427d975b..d1de40890b5 100644
--- a/bsp/renesas/ra2a1-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra2a1-ek/ra_gen/SConscript
@@ -11,8 +11,7 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2a1-ek/template.uvprojx b/bsp/renesas/ra2a1-ek/template.uvprojx
index d89374cfc3d..6d0ac48baf3 100644
--- a/bsp/renesas/ra2a1-ek/template.uvprojx
+++ b/bsp/renesas/ra2a1-ek/template.uvprojx
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra2e2-ek/SConscript b/bsp/renesas/ra2e2-ek/SConscript
index 77886f6906e..044f12316d4 100644
--- a/bsp/renesas/ra2e2-ek/SConscript
+++ b/bsp/renesas/ra2e2-ek/SConscript
@@ -13,8 +13,7 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('./src/*.c')
+    src = Glob('./src/*.c')
 
 if rtconfig.PLATFORM in ['armclang']:
     CPPPATH = [cwd + '/script/bsp_link/keil']
diff --git a/bsp/renesas/ra2e2-ek/buildinfo.gpdsc b/bsp/renesas/ra2e2-ek/buildinfo.gpdsc
deleted file mode 100644
index 87954779273..00000000000
--- a/bsp/renesas/ra2e2-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra2e2_ek/board.h" path=""/>
-        <file category="source" name="ra/board/ra2e2_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra2e2_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra2e2_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra2e2_ek/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA2E2A7.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2e2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2e2/bsp_feature.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra2e2/bsp_linker.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2e2/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2e2/bsp_peripheral.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_ofs_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra2e2-ek/project.uvprojx b/bsp/renesas/ra2e2-ek/project.uvprojx
index 10e8f604bda..ea428297115 100644
--- a/bsp/renesas/ra2e2-ek/project.uvprojx
+++ b/bsp/renesas/ra2e2-ek/project.uvprojx
@@ -69,7 +69,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>@via/rasc_armclang.via</MiscControls>
-              <Define>__RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define>
+              <Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\eventfd;..\..\..\libcpu\arm\cortex-m23;..\..\..\components\libc\posix\io\epoll;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;.;script\bsp_link\keil;..\..\..\components\finsh;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers;board;..\libraries\HAL_Drivers\drivers;..\..\..\include;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;ra_cfg\fsp_cfg;..\..\..\components\libc\compilers\common\extension\fcntl\octal;.;..\libraries\HAL_Drivers;..\..\..\include;..\..\..\components\finsh;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;board\ports;board;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;ra\fsp\inc\api;..\..\..\components\net\utest;..\..\..\components\libc\compilers\common\extension;ra\fsp\inc\instances;..\..\..\components\drivers\include;ra\fsp\inc;ra_gen;..\..\..\components\libc\posix\io\epoll;..\..\..\libcpu\arm\cortex-m23;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\smp_call;ra_cfg\fsp_cfg\bsp;..\libraries\HAL_Drivers\drivers\config;script\bsp_link\keil;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers\drivers</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1101,17 +1111,177 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ipc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ipc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_linker.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\ra2e2\bsp_linker.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra2e2-ek/ra/SConscript b/bsp/renesas/ra2e2-ek/ra/SConscript
index a53b39d234f..724e17d8ad9 100644
--- a/bsp/renesas/ra2e2-ek/ra/SConscript
+++ b/bsp/renesas/ra2e2-ek/ra/SConscript
@@ -11,16 +11,15 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '//fsp/src/bsp/mcu/ra2e2/bsp_linker.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '//fsp/src/bsp/mcu/ra2e2/bsp_linker.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2e2-ek/ra_cfg/SConscript b/bsp/renesas/ra2e2-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra2e2-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra2e2-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2e2-ek/ra_gen/SConscript b/bsp/renesas/ra2e2-ek/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra2e2-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra2e2-ek/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2e2-ek/template.uvprojx b/bsp/renesas/ra2e2-ek/template.uvprojx
index eccb5bed58c..b703a8b3e39 100644
--- a/bsp/renesas/ra2e2-ek/template.uvprojx
+++ b/bsp/renesas/ra2e2-ek/template.uvprojx
@@ -72,7 +72,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra2l1-cpk/SConscript b/bsp/renesas/ra2l1-cpk/SConscript
index 979a9d3429c..ee70eec8360 100644
--- a/bsp/renesas/ra2l1-cpk/SConscript
+++ b/bsp/renesas/ra2l1-cpk/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd + './src']
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd + './src']
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra2l1-cpk/buildinfo.gpdsc b/bsp/renesas/ra2l1-cpk/buildinfo.gpdsc
deleted file mode 100644
index 350c6657007..00000000000
--- a/bsp/renesas/ra2l1-cpk/buildinfo.gpdsc
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra2l1_cpk/board.h" path=""/>
-        <file category="source" name="ra/board/ra2l1_cpk/board_init.c"/>
-        <file category="header" name="ra/board/ra2l1_cpk/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra2l1_cpk/board_leds.c"/>
-        <file category="header" name="ra/board/ra2l1_cpk/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_icu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_power.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra2l1/bsp_power.h" path=""/>
-        <file category="other" name="ra/fsp/src/r_dtc/r_dtc.o"/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="other" name="ra/fsp/src/r_sci_spi/r_sci_spi.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_uart/r_sci_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra2l1-cpk/project.uvprojx b/bsp/renesas/ra2l1-cpk/project.uvprojx
index 1e79920a2d0..589f28ce7cc 100644
--- a/bsp/renesas/ra2l1-cpk/project.uvprojx
+++ b/bsp/renesas/ra2l1-cpk/project.uvprojx
@@ -334,9 +334,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wunused -Wuninitialized -Wall -Wmissing-declarations  -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__RTTHREAD__, RT_USING_LIBC, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS</Define>
+              <Define>__RTTHREAD__, RT_USING_LIBC, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>.;ra_cfg\fsp_cfg\bsp;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m23;..\..\..\components\net\utest;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers;..\..\..\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\smp_call;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\drivers\config;ra_cfg\fsp_cfg;..\..\..\components\libc\posix\io\eventfd;board;..\..\..\components\dfs\dfs_v1\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\components\libc\posix\io\epoll;..\..\..\components\finsh;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\drivers\config;ra\fsp\inc;..\..\..\components\drivers\include;ra_gen;..\..\..\components\libc\compilers\common\extension;board;src;..\..\..\components\libc\posix\io\poll;ra\fsp\inc\api;ra_cfg\fsp_cfg\bsp;board\ports;..\..\..\libcpu\arm\cortex-m23;ra\fsp\inc\instances;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;.;ra\arm\CMSIS_5\CMSIS\Core\Include;..\libraries\HAL_Drivers\drivers;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\dfs\dfs_v1\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\phy;..\..\..\components\drivers\smp_call;..\..\..\components\net\utest;ra_cfg\fsp_cfg;..\..\..\components\libc\compilers\common\extension\fcntl\octal</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1205,17 +1215,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra2l1-cpk/ra/SConscript b/bsp/renesas/ra2l1-cpk/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ra2l1-cpk/ra/SConscript
+++ b/bsp/renesas/ra2l1-cpk/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2l1-cpk/ra_gen/SConscript b/bsp/renesas/ra2l1-cpk/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra2l1-cpk/ra_gen/SConscript
+++ b/bsp/renesas/ra2l1-cpk/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra2l1-cpk/template.uvprojx b/bsp/renesas/ra2l1-cpk/template.uvprojx
index bf00a90b395..288c918f293 100644
--- a/bsp/renesas/ra2l1-cpk/template.uvprojx
+++ b/bsp/renesas/ra2l1-cpk/template.uvprojx
@@ -406,13 +406,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4e2-eco/SConscript b/bsp/renesas/ra4e2-eco/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra4e2-eco/SConscript
+++ b/bsp/renesas/ra4e2-eco/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra4e2-eco/buildinfo.gpdsc b/bsp/renesas/ra4e2-eco/buildinfo.gpdsc
deleted file mode 100644
index bc86dd4de18..00000000000
--- a/bsp/renesas/ra4e2-eco/buildinfo.gpdsc
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra4e2_fpb/board.h" path=""/>
-        <file category="source" name="ra/board/ra4e2_fpb/board_init.c"/>
-        <file category="header" name="ra/board/ra4e2_fpb/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra4e2_fpb/board_leds.c"/>
-        <file category="header" name="ra/board/ra4e2_fpb/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA4E2B9.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/board_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_macl.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_peripheral.h" path=""/>
-        <file category="other" name="ra/fsp/src/r_icu/r_icu.o"/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="other" name="ra/fsp/src/r_sci_i2c/r_sci_i2c.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_uart/r_sci_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra4e2-eco/project.uvprojx b/bsp/renesas/ra4e2-eco/project.uvprojx
index 819c2ab68b9..4adde6692a2 100644
--- a/bsp/renesas/ra4e2-eco/project.uvprojx
+++ b/bsp/renesas/ra4e2-eco/project.uvprojx
@@ -68,7 +68,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -78,7 +78,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -334,9 +334,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS, RT_USING_LIBC, __RTTHREAD__, RT_USING_ARMLIBC</Define>
+              <Define>__RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, RT_USING_LIBC, __STDC_LIMIT_MACROS</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;board;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\poll;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\net\utest;.;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;board\ports;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers\drivers\config;..\libraries\HAL_Drivers\drivers</IncludePath>
+              <IncludePath>..\..\..\components\libc\posix\io\epoll;ra\fsp\inc\api;..\libraries\HAL_Drivers;board;..\libraries\HAL_Drivers\drivers\config;.;..\libraries\HAL_Drivers\drivers;ra_gen;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;ra_cfg\fsp_cfg;ra\arm\CMSIS_6\CMSIS\Core\Include;board\ports;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\cortex-m33;ra\fsp\inc\instances;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\phy;ra_cfg\fsp_cfg\bsp;ra\fsp\inc;..\..\..\components\net\utest;..\..\..\components\drivers\include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -349,7 +349,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>1</ClangAsOpt>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls />
               <Define />
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1209,17 +1219,170 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4e2-eco/ra/SConscript b/bsp/renesas/ra4e2-eco/ra/SConscript
index 88feb6712cf..d51fddd5c12 100644
--- a/bsp/renesas/ra4e2-eco/ra/SConscript
+++ b/bsp/renesas/ra4e2-eco/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-eco/ra_cfg/SConscript b/bsp/renesas/ra4e2-eco/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra4e2-eco/ra_cfg/SConscript
+++ b/bsp/renesas/ra4e2-eco/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-eco/ra_gen/SConscript b/bsp/renesas/ra4e2-eco/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra4e2-eco/ra_gen/SConscript
+++ b/bsp/renesas/ra4e2-eco/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-eco/template.uvprojx b/bsp/renesas/ra4e2-eco/template.uvprojx
index b36167dfcc4..9324337f218 100644
--- a/bsp/renesas/ra4e2-eco/template.uvprojx
+++ b/bsp/renesas/ra4e2-eco/template.uvprojx
@@ -71,7 +71,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -81,7 +81,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -352,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>1</ClangAsOpt>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>
@@ -373,7 +373,7 @@
             <ScatterFile>.\script\fsp.scat</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--via=via/rasc_armlink.via</Misc>
+            <Misc></Misc>
             <LinkerInputFile></LinkerInputFile>
             <DisabledWarnings></DisabledWarnings>
           </LDads>
@@ -401,13 +401,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4e2-ek/SConscript b/bsp/renesas/ra4e2-ek/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra4e2-ek/SConscript
+++ b/bsp/renesas/ra4e2-ek/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra4e2-ek/board/ports/SConscript b/bsp/renesas/ra4e2-ek/board/ports/SConscript
index 4871d7248bf..7ca2195b2a7 100644
--- a/bsp/renesas/ra4e2-ek/board/ports/SConscript
+++ b/bsp/renesas/ra4e2-ek/board/ports/SConscript
@@ -9,7 +9,7 @@ src = []
 if GetDepend(['BSP_USING_RW007']):
     src += Glob('drv_rw007.c')
 
-CPPPATH = [cwd]
+CPPPATH = [cwd, cwd + "/../"]
 LOCAL_CFLAGS = ''
 
 if rtconfig.PLATFORM in ['gcc', 'armclang']:
diff --git a/bsp/renesas/ra4e2-ek/buildinfo.gpdsc b/bsp/renesas/ra4e2-ek/buildinfo.gpdsc
deleted file mode 100644
index 7e5b6a363c2..00000000000
--- a/bsp/renesas/ra4e2-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra4e2_ek/board.h" path=""/>
-        <file category="source" name="ra/board/ra4e2_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra4e2_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra4e2_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra4e2_ek/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA4E2B9.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_feature.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_linker.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4e2/bsp_peripheral.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_ofs_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra4e2-ek/project.uvprojx b/bsp/renesas/ra4e2-ek/project.uvprojx
index 99753a629ac..7f21de69814 100644
--- a/bsp/renesas/ra4e2-ek/project.uvprojx
+++ b/bsp/renesas/ra4e2-ek/project.uvprojx
@@ -66,9 +66,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -76,9 +76,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -332,10 +332,10 @@
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls>@via/rasc_armclang.via</MiscControls>
-              <Define>__CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC</Define>
+              <MiscControls />
+              <Define>__STDC_LIMIT_MACROS, RT_USING_LIBC, RT_USING_ARMLIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\compilers\common\extension;..\libraries\HAL_Drivers\drivers\config;..\libraries\HAL_Drivers;..\..\..\include;..\..\..\components\drivers\phy;.;..\..\..\components\drivers\smp_call;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\epoll;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\include;board\ports</IncludePath>
+              <IncludePath>..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;ra\fsp\inc;..\libraries\HAL_Drivers\drivers;board;..\..\..\components\drivers\smp_call;ra\arm\CMSIS_6\CMSIS\Core\Include;ra_gen;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;.;board\ports;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\cortex-m33;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra_cfg\fsp_cfg\bsp;..\..\..\components\finsh;ra_cfg\fsp_cfg;..\..\..\components\net\utest;..\..\..\include;ra\fsp\inc\api;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;ra\fsp\inc\instances</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -350,7 +350,7 @@
             <useXO>0</useXO>
             <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
-              <MiscControls>--via=via/rasc_armasm.via</MiscControls>
+              <MiscControls />
               <Define />
               <Undefine />
               <IncludePath />
@@ -376,6 +376,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1113,17 +1123,177 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ipc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ipc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_linker.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\ra4e2\bsp_linker.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cvendor="Renesas" Cclass="Flex Software" Cgroup="RA Configuration" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4e2-ek/ra/SConscript b/bsp/renesas/ra4e2-ek/ra/SConscript
index 10573571564..5d656160f79 100644
--- a/bsp/renesas/ra4e2-ek/ra/SConscript
+++ b/bsp/renesas/ra4e2-ek/ra/SConscript
@@ -11,15 +11,15 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/mcu/ra4e2/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-ek/ra_cfg/SConscript b/bsp/renesas/ra4e2-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra4e2-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra4e2-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-ek/ra_gen/SConscript b/bsp/renesas/ra4e2-ek/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra4e2-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra4e2-ek/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4e2-ek/template.uvprojx b/bsp/renesas/ra4e2-ek/template.uvprojx
index 00936985fbc..455c804d7f6 100644
--- a/bsp/renesas/ra4e2-ek/template.uvprojx
+++ b/bsp/renesas/ra4e2-ek/template.uvprojx
@@ -66,9 +66,9 @@
                         <nStopU2X>0</nStopU2X>
                     </BeforeCompile>
                     <BeforeMake>
-                        <RunUserProg1>1</RunUserProg1>
+                        <RunUserProg1>0</RunUserProg1>
                         <RunUserProg2>0</RunUserProg2>
-                        <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+                        <UserProg1Name></UserProg1Name>
                         <UserProg2Name></UserProg2Name>
                         <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
                         <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -76,9 +76,9 @@
                         <nStopB2X>0</nStopB2X>
                     </BeforeMake>
                     <AfterMake>
-                        <RunUserProg1>1</RunUserProg1>
+                        <RunUserProg1>0</RunUserProg1>
                         <RunUserProg2>0</RunUserProg2>
-                        <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+                        <UserProg1Name></UserProg1Name>
                         <UserProg2Name></UserProg2Name>
                         <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
                         <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -332,7 +332,7 @@
                         <v6WtE>0</v6WtE>
                         <v6Rtti>0</v6Rtti>
                         <VariousControls>
-                            <MiscControls>@via/rasc_armclang.via</MiscControls>
+                            <MiscControls></MiscControls>
                             <Define></Define>
                             <Undefine></Undefine>
                             <IncludePath></IncludePath>
@@ -350,7 +350,7 @@
                         <useXO>0</useXO>
                         <ClangAsOpt>4</ClangAsOpt>
                         <VariousControls>
-                            <MiscControls>--via=via/rasc_armasm.via</MiscControls>
+                            <MiscControls></MiscControls>
                             <Define></Define>
                             <Undefine></Undefine>
                             <IncludePath></IncludePath>
@@ -369,7 +369,7 @@
                         <ScatterFile>.\script\fsp.scat</ScatterFile>
                         <IncludeLibs></IncludeLibs>
                         <IncludeLibsPath></IncludeLibsPath>
-                        <Misc>--via=via/rasc_armlink.via</Misc>
+                        <Misc></Misc>
                         <LinkerInputFile></LinkerInputFile>
                         <DisabledWarnings></DisabledWarnings>
                     </LDads>
@@ -386,13 +386,6 @@
         </Target>
     </Targets>
     <RTE>
-        <gpdscs>
-            <gpdsc name="buildinfo.gpdsc">
-                <targetInfos>
-                    <targetInfo name="Target_1"/>
-                </targetInfos>
-            </gpdsc>
-        </gpdscs>
         <apis/>
         <components>
             <component Cvendor="Renesas" Cclass="Flex Software" Cgroup="RA Configuration" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4m1-ek/SConscript b/bsp/renesas/ra4m1-ek/SConscript
index 5c6a894f77e..a3b105cff28 100644
--- a/bsp/renesas/ra4m1-ek/SConscript
+++ b/bsp/renesas/ra4m1-ek/SConscript
@@ -13,8 +13,7 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('./src/*.c')
+    src = Glob('./src/*.c')
 
 if rtconfig.PLATFORM in ['armclang']:
     CPPPATH = [cwd + '/script/bsp_link/Keil']
diff --git a/bsp/renesas/ra4m1-ek/buildinfo.gpdsc b/bsp/renesas/ra4m1-ek/buildinfo.gpdsc
deleted file mode 100644
index 77a2b982276..00000000000
--- a/bsp/renesas/ra4m1-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra4m1_ek/board.h" path=""/>
-        <file category="source" name="ra/board/ra4m1_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra4m1_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra4m1_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra4m1_ek/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_external_irq_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_icu.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA4M1AB.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_feature.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_linker.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_override.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m1/bsp_peripheral.h" path=""/>
-        <file category="other" name="ra/fsp/src/r_can/r_can.o"/>
-        <file category="source" name="ra/fsp/src/r_icu/r_icu.c"/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_spi/r_spi.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_ofs_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_icu_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra4m1-ek/project.uvprojx b/bsp/renesas/ra4m1-ek/project.uvprojx
index c07b8a2aa41..740aa74f179 100644
--- a/bsp/renesas/ra4m1-ek/project.uvprojx
+++ b/bsp/renesas/ra4m1-ek/project.uvprojx
@@ -68,7 +68,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -334,9 +334,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, __RTTHREAD__</Define>
+              <Define>__RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\epoll;script\bsp_link\Keil;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;board\ports;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;board;..\..\..\components\net\utest;..\..\..\components\drivers\include;.</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;script\bsp_link\Keil;..\..\..\components\libc\posix\io\poll;..\..\..\include;..\..\..\components\net\utest;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\finsh;ra\fsp\inc\instances;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;.;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra_cfg\fsp_cfg\bsp;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board\ports;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;board;..\..\..\components\drivers\spi;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra_gen;..\..\..\components\libc\compilers\common\extension;ra\fsp\inc;..\..\..\components\drivers\include;ra\fsp\inc\api;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;ra_cfg\fsp_cfg;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\libc\posix\ipc</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -417,6 +427,25 @@
         </Group>
         <Group>
           <GroupName>DeviceDrivers</GroupName>
+          <Files>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\components\drivers\adc\adc.c</FilePath>
+              <FileOption>
+                <FileArmAds>
+                  <Cads>
+                    <VariousControls>
+                      <MiscControls> </MiscControls>
+                      <Define>__RT_IPC_SOURCE__</Define>
+                      <Undefine> </Undefine>
+                      <IncludePath> </IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
+            </File>
+          </Files>
           <Files>
             <File>
               <FileName>dev_can.c</FileName>
@@ -683,25 +712,6 @@
               </FileOption>
             </File>
           </Files>
-          <Files>
-            <File>
-              <FileName>adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\components\drivers\misc\adc.c</FilePath>
-              <FileOption>
-                <FileArmAds>
-                  <Cads>
-                    <VariousControls>
-                      <MiscControls> </MiscControls>
-                      <Define>__RT_IPC_SOURCE__</Define>
-                      <Undefine> </Undefine>
-                      <IncludePath> </IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
-            </File>
-          </Files>
           <Files>
             <File>
               <FileName>dac.c</FileName>
@@ -1328,17 +1338,184 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ipc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ipc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_linker.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\ra4m1\bsp_linker.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_icu.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_icu\r_icu.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4m1-ek/ra/SConscript b/bsp/renesas/ra4m1-ek/ra/SConscript
index ed9dd17d6d0..b3c511b9bc5 100644
--- a/bsp/renesas/ra4m1-ek/ra/SConscript
+++ b/bsp/renesas/ra4m1-ek/ra/SConscript
@@ -11,16 +11,15 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += Glob(cwd + '/fsp/src/bsp/mcu/ra4m1/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/mcu/ra4m1/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m1-ek/ra_cfg/SConscript b/bsp/renesas/ra4m1-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra4m1-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra4m1-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m1-ek/ra_gen/SConscript b/bsp/renesas/ra4m1-ek/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra4m1-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra4m1-ek/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m1-ek/template.uvprojx b/bsp/renesas/ra4m1-ek/template.uvprojx
index 991459e1088..a9488048d54 100644
--- a/bsp/renesas/ra4m1-ek/template.uvprojx
+++ b/bsp/renesas/ra4m1-ek/template.uvprojx
@@ -71,7 +71,7 @@
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -401,13 +401,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4m2-eco/SConscript b/bsp/renesas/ra4m2-eco/SConscript
index 0f2e5f740a5..5de0d34f992 100644
--- a/bsp/renesas/ra4m2-eco/SConscript
+++ b/bsp/renesas/ra4m2-eco/SConscript
@@ -13,10 +13,9 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
-        src += Glob('./src/*.cpp')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
+    src += Glob('./src/*.cpp')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra4m2-eco/buildinfo.gpdsc b/bsp/renesas/ra4m2-eco/buildinfo.gpdsc
deleted file mode 100644
index 22a4da19563..00000000000
--- a/bsp/renesas/ra4m2-eco/buildinfo.gpdsc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA4M2AD.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m2/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra4m2/bsp_mcu_info.h" path=""/>
-        <file category="other" name="ra/fsp/src/r_dtc/r_dtc.o"/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="other" name="ra/fsp/src/r_sci_spi/r_sci_spi.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_uart/r_sci_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra4m2-eco/project.uvprojx b/bsp/renesas/ra4m2-eco/project.uvprojx
index b58f075bddd..d79d95c3023 100644
--- a/bsp/renesas/ra4m2-eco/project.uvprojx
+++ b/bsp/renesas/ra4m2-eco/project.uvprojx
@@ -78,7 +78,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -334,9 +334,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_ARMLIBC, __RTTHREAD__, RT_USING_LIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND</Define>
+              <Define>__CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __RTTHREAD__, RT_USING_LIBC</Define>
               <Undefine />
-              <IncludePath>.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\eventfd;board;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\dfs\dfs_v1\filesystems\devfs;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\net\utest;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\epoll;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers;..\..\..\libcpu\arm\common;..\..\..\components\dfs\dfs_v1\include</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;.;ra\fsp\inc;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\net\utest;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\drivers\phy;..\..\..\components\dfs\dfs_v1\include;ra\fsp\inc\api;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\io\poll;ra\fsp\inc\instances;ra_cfg\fsp_cfg\bsp;..\..\..\components\dfs\dfs_v1\filesystems\devfs;board\ports;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\..\..\components\finsh;ra_gen;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\include;ra\arm\CMSIS_5\CMSIS\Core\Include;board;ra_cfg\fsp_cfg;..\..\..\libcpu\arm\cortex-m4</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1205,17 +1215,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra4m2-eco/ra/SConscript b/bsp/renesas/ra4m2-eco/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ra4m2-eco/ra/SConscript
+++ b/bsp/renesas/ra4m2-eco/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m2-eco/ra_cfg/SConscript b/bsp/renesas/ra4m2-eco/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra4m2-eco/ra_cfg/SConscript
+++ b/bsp/renesas/ra4m2-eco/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m2-eco/ra_gen/SConscript b/bsp/renesas/ra4m2-eco/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra4m2-eco/ra_gen/SConscript
+++ b/bsp/renesas/ra4m2-eco/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra4m2-eco/template.uvprojx b/bsp/renesas/ra4m2-eco/template.uvprojx
index 13066a068b0..b8fa9136e76 100644
--- a/bsp/renesas/ra4m2-eco/template.uvprojx
+++ b/bsp/renesas/ra4m2-eco/template.uvprojx
@@ -81,7 +81,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -401,13 +401,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6e2-ek/SConscript b/bsp/renesas/ra6e2-ek/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra6e2-ek/SConscript
+++ b/bsp/renesas/ra6e2-ek/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6e2-ek/buildinfo.gpdsc b/bsp/renesas/ra6e2-ek/buildinfo.gpdsc
deleted file mode 100644
index 273d48071d2..00000000000
--- a/bsp/renesas/ra6e2-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board.h" path=""/>
-        <file category="source" name="ra/board/ra6e2_fpb/board_init.c"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra6e2_fpb/board_leds.c"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6E2BB.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/board_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_feature_gen.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6e2-ek/project.uvprojx b/bsp/renesas/ra6e2-ek/project.uvprojx
index c7dfe5a6267..2e6d9fd4238 100644
--- a/bsp/renesas/ra6e2-ek/project.uvprojx
+++ b/bsp/renesas/ra6e2-ek/project.uvprojx
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "5.1.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC</Define>
+              <Define>RT_USING_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\posix\io\poll;board;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension;.;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;board\ports;..\..\..\components\net\utest;..\libraries\HAL_Drivers\drivers\config;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\common;..\..\..\components\drivers\phy</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\net\utest;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\libc\compilers\common\extension;ra_cfg\fsp_cfg\bsp;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\eventfd;ra\fsp\inc\api;ra\fsp\inc\instances;ra_cfg\fsp_cfg;..\..\..\components\drivers\include;.;..\..\..\components\drivers\include;ra\fsp\inc;..\..\..\include;board;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\ipc;..\..\..\components\finsh;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;ra_gen;board\ports;..\..\..\components\libc\posix\io\poll</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1114,17 +1124,170 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6e2-ek/ra/SConscript b/bsp/renesas/ra6e2-ek/ra/SConscript
index 88feb6712cf..d51fddd5c12 100644
--- a/bsp/renesas/ra6e2-ek/ra/SConscript
+++ b/bsp/renesas/ra6e2-ek/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-ek/ra_cfg/SConscript b/bsp/renesas/ra6e2-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra6e2-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra6e2-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-ek/ra_gen/SConscript b/bsp/renesas/ra6e2-ek/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra6e2-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra6e2-ek/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-ek/template.uvprojx b/bsp/renesas/ra6e2-ek/template.uvprojx
index a3e51e35dc1..ccd536bab21 100644
--- a/bsp/renesas/ra6e2-ek/template.uvprojx
+++ b/bsp/renesas/ra6e2-ek/template.uvprojx
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "5.1.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -373,7 +373,7 @@
             <ScatterFile>.\script\fsp.scat</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--via=via/rasc_armlink.via</Misc>
+            <Misc></Misc>
             <LinkerInputFile></LinkerInputFile>
             <DisabledWarnings>6319,6314</DisabledWarnings>
           </LDads>
@@ -401,13 +401,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6e2-fpb/EventRecorderStub.scvd b/bsp/renesas/ra6e2-fpb/EventRecorderStub.scvd
deleted file mode 100644
index 2956b296838..00000000000
--- a/bsp/renesas/ra6e2-fpb/EventRecorderStub.scvd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
-
-<component name="EventRecorderStub" version="1.0.0"/>       <!--name and version of the component-->
-  <events>
-  </events>
-
-</component_viewer>
diff --git a/bsp/renesas/ra6e2-fpb/SConscript b/bsp/renesas/ra6e2-fpb/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra6e2-fpb/SConscript
+++ b/bsp/renesas/ra6e2-fpb/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6e2-fpb/buildinfo.gpdsc b/bsp/renesas/ra6e2-fpb/buildinfo.gpdsc
deleted file mode 100644
index 273d48071d2..00000000000
--- a/bsp/renesas/ra6e2-fpb/buildinfo.gpdsc
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board.h" path=""/>
-        <file category="source" name="ra/board/ra6e2_fpb/board_init.c"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra6e2_fpb/board_leds.c"/>
-        <file category="header" name="ra/board/ra6e2_fpb/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6E2BB.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/board_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_feature_gen.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6e2/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6e2-fpb/project.uvprojx b/bsp/renesas/ra6e2-fpb/project.uvprojx
index b42f4c97e36..3f5a459f6fc 100644
--- a/bsp/renesas/ra6e2-fpb/project.uvprojx
+++ b/bsp/renesas/ra6e2-fpb/project.uvprojx
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "5.1.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__RTTHREAD__, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC, RT_USING_LIBC</Define>
+              <Define>__CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;board;..\..\..\components\libc\compilers\common\include;.;..\..\..\components\net\utest;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\epoll;..\libraries\HAL_Drivers\drivers;ra\fsp\inc\instances;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra_cfg\fsp_cfg;board;..\..\..\components\finsh;..\libraries\HAL_Drivers\drivers\config;ra_cfg\fsp_cfg\bsp;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\poll;..\..\..\components\net\utest;ra_gen;..\..\..\components\drivers\include;board\ports;..\..\..\libcpu\arm\common;..\..\..\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\include;.;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra\fsp\inc;..\..\..\components\drivers\include;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\libc\posix\io\eventfd;ra\fsp\inc\api</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1114,17 +1124,170 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6e2-fpb/ra/SConscript b/bsp/renesas/ra6e2-fpb/ra/SConscript
index 88feb6712cf..d51fddd5c12 100644
--- a/bsp/renesas/ra6e2-fpb/ra/SConscript
+++ b/bsp/renesas/ra6e2-fpb/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-fpb/ra_cfg/SConscript b/bsp/renesas/ra6e2-fpb/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra6e2-fpb/ra_cfg/SConscript
+++ b/bsp/renesas/ra6e2-fpb/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-fpb/ra_gen/SConscript b/bsp/renesas/ra6e2-fpb/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra6e2-fpb/ra_gen/SConscript
+++ b/bsp/renesas/ra6e2-fpb/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6e2-fpb/template.uvprojx b/bsp/renesas/ra6e2-fpb/template.uvprojx
index a3e51e35dc1..ccd536bab21 100644
--- a/bsp/renesas/ra6e2-fpb/template.uvprojx
+++ b/bsp/renesas/ra6e2-fpb/template.uvprojx
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "5.1.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -373,7 +373,7 @@
             <ScatterFile>.\script\fsp.scat</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--via=via/rasc_armlink.via</Misc>
+            <Misc></Misc>
             <LinkerInputFile></LinkerInputFile>
             <DisabledWarnings>6319,6314</DisabledWarnings>
           </LDads>
@@ -401,13 +401,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m3-ek/SConscript b/bsp/renesas/ra6m3-ek/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra6m3-ek/SConscript
+++ b/bsp/renesas/ra6m3-ek/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc b/bsp/renesas/ra6m3-ek/buildinfo.gpdsc
deleted file mode 100644
index 75232d3a70b..00000000000
--- a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra6m3/board.h" path=""/>
-        <file category="header" name="ra/board/ra6m3/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra6m3/board_init.c"/>
-        <file category="header" name="ra/board/ra6m3/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra6m3/board_leds.c"/>
-        <file category="header" name="ra/board/ra6m3/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_uart/r_sci_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6m3-ek/project.uvprojx b/bsp/renesas/ra6m3-ek/project.uvprojx
index 4fc7673b1e2..4f12a132bfb 100644
--- a/bsp/renesas/ra6m3-ek/project.uvprojx
+++ b/bsp/renesas/ra6m3-ek/project.uvprojx
@@ -78,7 +78,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -333,9 +333,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wunused -Wuninitialized -Wall  -Wmissing-declarations  -Wpointer-arith  -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __RTTHREAD__</Define>
+              <Define>RT_USING_LIBC, __RTTHREAD__, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\drivers\include;..\..\..\components\drivers\include;board\ports;..\..\..\components\drivers\phy;..\..\..\components\libc\compilers\common\include;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\finsh;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\common;..\..\..\components\libc\compilers\common\extension;board;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\ipc;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;.;..\..\..\include;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\libcpu\arm\cortex-m4;ra\arm\CMSIS_5\CMSIS\Core\Include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;board;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;.;..\..\..\components\finsh;board\ports;..\libraries\HAL_Drivers;..\..\..\components\drivers\phy;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra_gen;ra_cfg\fsp_cfg\bsp;..\libraries\HAL_Drivers\drivers;ra\fsp\inc\api;ra\fsp\inc;..\..\..\components\net\utest;ra_cfg\fsp_cfg;..\..\..\components\drivers\include;ra\fsp\inc\instances;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension\fcntl\octal</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -376,6 +376,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1063,17 +1073,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m3-ek/ra/SConscript b/bsp/renesas/ra6m3-ek/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ra6m3-ek/ra/SConscript
+++ b/bsp/renesas/ra6m3-ek/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-ek/ra_cfg/SConscript b/bsp/renesas/ra6m3-ek/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra6m3-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra6m3-ek/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-ek/ra_gen/SConscript b/bsp/renesas/ra6m3-ek/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra6m3-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra6m3-ek/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-ek/template.uvprojx b/bsp/renesas/ra6m3-ek/template.uvprojx
index 09c7c60fe0d..f21e96cc3de 100644
--- a/bsp/renesas/ra6m3-ek/template.uvprojx
+++ b/bsp/renesas/ra6m3-ek/template.uvprojx
@@ -81,7 +81,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -400,13 +400,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m3-hmi-board/SConscript b/bsp/renesas/ra6m3-hmi-board/SConscript
index ba761a6dc6c..a722a3913e4 100644
--- a/bsp/renesas/ra6m3-hmi-board/SConscript
+++ b/bsp/renesas/ra6m3-hmi-board/SConscript
@@ -14,9 +14,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6m3-hmi-board/buildinfo.gpdsc b/bsp/renesas/ra6m3-hmi-board/buildinfo.gpdsc
deleted file mode 100644
index 162eb8861ae..00000000000
--- a/bsp/renesas/ra6m3-hmi-board/buildinfo.gpdsc
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="include" name="ra/tes/dave2d/inc/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA6M3AH.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6m3-hmi-board/project.uvprojx b/bsp/renesas/ra6m3-hmi-board/project.uvprojx
index d487b539486..aba4a9fdfd0 100644
--- a/bsp/renesas/ra6m3-hmi-board/project.uvprojx
+++ b/bsp/renesas/ra6m3-hmi-board/project.uvprojx
@@ -78,7 +78,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -333,9 +333,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wunused -Wuninitialized -Wall  -Wmissing-declarations  -Wpointer-arith  -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define>
+              <Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;.;board\ports\wifi;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\net\utest;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\finsh;..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\posix\io\eventfd;board;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;board\ports;..\..\..\components\drivers\phy;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\poll;..\libraries\HAL_Drivers\drivers</IncludePath>
+              <IncludePath>..\..\..\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;ra\fsp\inc\api;board\ports;board\ports\wifi;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\ipc;..\..\..\components\finsh;..\..\..\components\drivers\include;ra_cfg\fsp_cfg;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;board;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra\fsp\inc;..\..\..\components\drivers\include;ra_cfg\fsp_cfg\bsp;ra\fsp\inc\instances;..\..\..\libcpu\arm\common;..\..\..\components\net\utest;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;.;..\libraries\HAL_Drivers\drivers;ra_gen;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\poll;ra\arm\CMSIS_5\CMSIS\Core\Include;ra\tes\dave2d\inc;..\..\..\components\libc\posix\io\epoll</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -376,6 +376,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1118,17 +1128,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m3-hmi-board/ra/SConscript b/bsp/renesas/ra6m3-hmi-board/ra/SConscript
index 262fcd21419..bedb81c847c 100644
--- a/bsp/renesas/ra6m3-hmi-board/ra/SConscript
+++ b/bsp/renesas/ra6m3-hmi-board/ra/SConscript
@@ -12,20 +12,19 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',
-                    cwd + '/tes/dave2d/inc']
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',
+                cwd + '/tes/dave2d/inc']
 
-        if GetDepend('BSP_USING_LCD') or GetDepend('BSP_USING_LVGL'):
-            src += Glob(cwd + '/tes/dave2d/src/*.c')
-            CPPPATH += [cwd + '/tes/dave2d/inc']
+    if GetDepend('BSP_USING_LCD') or GetDepend('BSP_USING_LVGL'):
+        src += Glob(cwd + '/tes/dave2d/src/*.c')
+        CPPPATH += [cwd + '/tes/dave2d/inc']
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-hmi-board/ra_cfg/SConscript b/bsp/renesas/ra6m3-hmi-board/ra_cfg/SConscript
index ff52ceb4fea..96725790df8 100644
--- a/bsp/renesas/ra6m3-hmi-board/ra_cfg/SConscript
+++ b/bsp/renesas/ra6m3-hmi-board/ra_cfg/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-hmi-board/ra_gen/SConscript b/bsp/renesas/ra6m3-hmi-board/ra_gen/SConscript
index 6a52bcd6156..28ddea32732 100644
--- a/bsp/renesas/ra6m3-hmi-board/ra_gen/SConscript
+++ b/bsp/renesas/ra6m3-hmi-board/ra_gen/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m3-hmi-board/template.uvprojx b/bsp/renesas/ra6m3-hmi-board/template.uvprojx
index 09c7c60fe0d..f21e96cc3de 100644
--- a/bsp/renesas/ra6m3-hmi-board/template.uvprojx
+++ b/bsp/renesas/ra6m3-hmi-board/template.uvprojx
@@ -81,7 +81,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -400,13 +400,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m4-cpk/SConscript b/bsp/renesas/ra6m4-cpk/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra6m4-cpk/SConscript
+++ b/bsp/renesas/ra6m4-cpk/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc b/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
deleted file mode 100644
index c79b6df91b1..00000000000
--- a/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra6m4_cpk/board.h" path=""/>
-        <file category="header" name="ra/board/ra6m4_cpk/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra6m4_cpk/board_init.c"/>
-        <file category="header" name="ra/board/ra6m4_cpk/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra6m4_cpk/board_leds.c"/>
-        <file category="header" name="ra/board/ra6m4_cpk/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6m4-cpk/project.uvprojx b/bsp/renesas/ra6m4-cpk/project.uvprojx
index a8a53f31b82..f4d964bf0d0 100644
--- a/bsp/renesas/ra6m4-cpk/project.uvprojx
+++ b/bsp/renesas/ra6m4-cpk/project.uvprojx
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -334,9 +334,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC</Define>
+              <Define>RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, __STDC_LIMIT_MACROS, __RTTHREAD__</Define>
               <Undefine />
-              <IncludePath>..\libraries\HAL_Drivers\drivers;..\..\..\include;board;.;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\spi;..\..\..\components\libc\posix\io\poll;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\net\utest;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\cortex-m4;board\ports;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\epoll</IncludePath>
+              <IncludePath>..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;ra\arm\CMSIS_5\CMSIS\Core\Include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\spi;ra\fsp\inc\instances;..\..\..\components\drivers\include;ra_cfg\fsp_cfg\bsp;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\include;ra_cfg\fsp_cfg;ra_gen;ra\fsp\inc\api;..\..\..\components\libc\compilers\common\include;.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\epoll;..\..\..\components\net\utest;..\..\..\components\libc\compilers\common\extension;board;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;ra\fsp\inc;board\ports;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\cortex-m4</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -377,6 +377,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1102,17 +1112,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m4-cpk/ra/SConscript b/bsp/renesas/ra6m4-cpk/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ra6m4-cpk/ra/SConscript
+++ b/bsp/renesas/ra6m4-cpk/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript
index 016653baf04..3a851125326 100644
--- a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript
+++ b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript
+++ b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-cpk/template.uvprojx b/bsp/renesas/ra6m4-cpk/template.uvprojx
index 19077cffba4..52aaf130e4c 100644
--- a/bsp/renesas/ra6m4-cpk/template.uvprojx
+++ b/bsp/renesas/ra6m4-cpk/template.uvprojx
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -398,13 +398,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m4-iot/SConscript b/bsp/renesas/ra6m4-iot/SConscript
index aee8a3bb36d..68df10a7599 100644
--- a/bsp/renesas/ra6m4-iot/SConscript
+++ b/bsp/renesas/ra6m4-iot/SConscript
@@ -13,9 +13,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra6m4-iot/buildinfo.gpdsc b/bsp/renesas/ra6m4-iot/buildinfo.gpdsc
deleted file mode 100644
index a9fe506566f..00000000000
--- a/bsp/renesas/ra6m4-iot/buildinfo.gpdsc
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra6m4_iot/board.h" path=""/>
-        <file category="header" name="ra/board/ra6m4_iot/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra6m4_iot/board_init.c"/>
-        <file category="header" name="ra/board/ra6m4_iot/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra6m4_iot/board_keys.c"/>
-        <file category="header" name="ra/board/ra6m4_iot/board_keys.h" path=""/>
-        <file category="source" name="ra/board/ra6m4_iot/board_leds.c"/>
-        <file category="header" name="ra/board/ra6m4_iot/board_leds.h" path=""/>
-        <file category="header" name="ra/board/ra6m4_iot/SEGGER_RTT.h" path=""/>
-        <file category="header" name="ra/board/ra6m4_iot/SEGGER_RTT_Conf.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra6m4/bsp_mcu_info.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra6m4-iot/project.uvprojx b/bsp/renesas/ra6m4-iot/project.uvprojx
index 3b0760accd4..aae57465ed6 100644
--- a/bsp/renesas/ra6m4-iot/project.uvprojx
+++ b/bsp/renesas/ra6m4-iot/project.uvprojx
@@ -78,7 +78,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -333,9 +333,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC, RT_USING_LIBC, __STDC_LIMIT_MACROS</Define>
+              <Define>RT_USING_ARMLIBC, __RTTHREAD__, RT_USING_LIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>board;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;..\..\..\components\net\utest;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\smp_call;..\..\..\include;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\include;.;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers\drivers;..\libraries\HAL_Drivers\drivers\config</IncludePath>
+              <IncludePath>..\libraries\HAL_Drivers\drivers;ra\arm\CMSIS_5\CMSIS\Core\Include;.;ra_cfg\fsp_cfg\bsp;..\..\..\components\finsh;board\ports;..\..\..\components\net\utest;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers\drivers\config;..\..\..\libcpu\arm\common;ra\fsp\inc;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra_cfg\fsp_cfg;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\poll;board;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra\fsp\inc\api;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\smp_call;..\..\..\components\libc\posix\ipc;..\..\..\include;ra\fsp\inc\instances;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;ra_gen</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -376,6 +376,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1099,17 +1109,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_uart\r_sci_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra6m4-iot/ra/SConscript b/bsp/renesas/ra6m4-iot/ra/SConscript
index 10573571564..30adfc91dc1 100644
--- a/bsp/renesas/ra6m4-iot/ra/SConscript
+++ b/bsp/renesas/ra6m4-iot/ra/SConscript
@@ -11,15 +11,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript
index 21af4711c50..ae58e285987 100644
--- a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript
+++ b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-iot/ra_gen/SConscript b/bsp/renesas/ra6m4-iot/ra_gen/SConscript
index 09be271571a..47e2fd4aef2 100644
--- a/bsp/renesas/ra6m4-iot/ra_gen/SConscript
+++ b/bsp/renesas/ra6m4-iot/ra_gen/SConscript
@@ -11,9 +11,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in ['gcc', 'armclang']:
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra6m4-iot/template.uvprojx b/bsp/renesas/ra6m4-iot/template.uvprojx
index 32d6f3cf181..1b61f529307 100644
--- a/bsp/renesas/ra6m4-iot/template.uvprojx
+++ b/bsp/renesas/ra6m4-iot/template.uvprojx
@@ -81,7 +81,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "3.5.0" --gensecurebundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -400,13 +400,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8d1-ek/SConscript b/bsp/renesas/ra8d1-ek/SConscript
index ba761a6dc6c..a722a3913e4 100644
--- a/bsp/renesas/ra8d1-ek/SConscript
+++ b/bsp/renesas/ra8d1-ek/SConscript
@@ -14,9 +14,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra8d1-ek/buildinfo.gpdsc b/bsp/renesas/ra8d1-ek/buildinfo.gpdsc
deleted file mode 100644
index 704dd908ef9..00000000000
--- a/bsp/renesas/ra8d1-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra8d1_ek/board.h" path=""/>
-        <file category="header" name="ra/board/ra8d1_ek/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_leds.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_sdram.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_sdram.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_b_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA8D1BH.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_override.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_b_uart/r_sci_b_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_b_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra8d1-ek/project.uvprojx b/bsp/renesas/ra8d1-ek/project.uvprojx
index 7e2ed14a598..955cbdf403c 100644
--- a/bsp/renesas/ra8d1-ek/project.uvprojx
+++ b/bsp/renesas/ra8d1-ek/project.uvprojx
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define>
+              <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;board\ports\wifi;..\..\..\components\finsh;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\net\utest;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;board\ports;board;..\..\..\components\libc\compilers\common\extension\fcntl\octal;.;..\..\..\libcpu\arm\cortex-m85;..\..\..\components\drivers\include;..\..\..\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\common</IncludePath>
+              <IncludePath>board\ports\wifi;..\..\..\components\libc\compilers\common\extension;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;ra_cfg\fsp_cfg;ra_cfg\fsp_cfg\bsp;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\cortex-m85;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;board\ports;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\finsh;board;.;ra\fsp\inc\instances;ra\fsp\inc\api;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;ra\fsp\inc;ra\arm\CMSIS_5\CMSIS\Core\Include;..\..\..\components\drivers\smp_call;..\..\..\libcpu\arm\common;..\..\..\components\drivers\phy;ra_gen;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1158,17 +1168,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_b_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_b_uart\r_sci_b_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8d1-ek/ra/SConscript b/bsp/renesas/ra8d1-ek/ra/SConscript
index 294776d3057..4906101529e 100644
--- a/bsp/renesas/ra8d1-ek/ra/SConscript
+++ b/bsp/renesas/ra8d1-ek/ra/SConscript
@@ -12,15 +12,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 if GetDepend('BSP_USING_G2D'):
     src += Glob(cwd + '/tes/dave2d/src/*.c')
diff --git a/bsp/renesas/ra8d1-ek/ra_cfg/SConscript b/bsp/renesas/ra8d1-ek/ra_cfg/SConscript
index ff52ceb4fea..96725790df8 100644
--- a/bsp/renesas/ra8d1-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra8d1-ek/ra_cfg/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8d1-ek/ra_gen/SConscript b/bsp/renesas/ra8d1-ek/ra_gen/SConscript
index 6a52bcd6156..28ddea32732 100644
--- a/bsp/renesas/ra8d1-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra8d1-ek/ra_gen/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8d1-ek/template.uvprojx b/bsp/renesas/ra8d1-ek/template.uvprojx
index 835f5975fa4..f3bdfad65d9 100644
--- a/bsp/renesas/ra8d1-ek/template.uvprojx
+++ b/bsp/renesas/ra8d1-ek/template.uvprojx
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8d1-vision-board/SConscript b/bsp/renesas/ra8d1-vision-board/SConscript
index ba761a6dc6c..a722a3913e4 100644
--- a/bsp/renesas/ra8d1-vision-board/SConscript
+++ b/bsp/renesas/ra8d1-vision-board/SConscript
@@ -14,9 +14,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra8d1-vision-board/buildinfo.gpdsc b/bsp/renesas/ra8d1-vision-board/buildinfo.gpdsc
deleted file mode 100644
index 704dd908ef9..00000000000
--- a/bsp/renesas/ra8d1-vision-board/buildinfo.gpdsc
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra8d1_ek/board.h" path=""/>
-        <file category="header" name="ra/board/ra8d1_ek/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_leds.h" path=""/>
-        <file category="source" name="ra/board/ra8d1_ek/board_sdram.c"/>
-        <file category="header" name="ra/board/ra8d1_ek/board_sdram.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_b_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA8D1BH.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8d1/bsp_override.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_b_uart/r_sci_b_uart.c"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_b_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra8d1-vision-board/project.uvprojx b/bsp/renesas/ra8d1-vision-board/project.uvprojx
index b4e733a7703..a8961f5e1cc 100644
--- a/bsp/renesas/ra8d1-vision-board/project.uvprojx
+++ b/bsp/renesas/ra8d1-vision-board/project.uvprojx
@@ -79,7 +79,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>__STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, BSP_CFG_RTOS = 2, __RTTHREAD__, RT_USING_ARMLIBC</Define>
+              <Define>BSP_CFG_RTOS = 2, RT_USING_LIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC</Define>
               <Undefine />
-              <IncludePath>..\libraries\HAL_Drivers;..\..\..\components\drivers\include;.;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m85;..\..\..\components\libc\posix\io\eventfd;board\ports\wifi;..\..\..\components\finsh;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\ipc;board;board\ports;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\net\utest;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include;.;ra_cfg\fsp_cfg;ra_gen;..\..\..\libcpu\arm\common;..\..\..\components\drivers\include;ra\fsp\inc\instances;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\..\..\components\net\utest;board;ra\arm\CMSIS_5\CMSIS\Core\Include;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\io\poll;..\..\..\libcpu\arm\cortex-m85;..\..\..\components\libc\posix\io\epoll;board\ports\wifi;ra_cfg\fsp_cfg\bsp;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\finsh;..\..\..\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\ipc;..\..\..\components\libc\compilers\common\extension\fcntl\octal;board\ports;ra\fsp\inc;..\..\..\components\drivers\smp_call;ra\fsp\inc\api;..\..\..\components\drivers\include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1158,17 +1168,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_b_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_b_uart\r_sci_b_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8d1-vision-board/ra/SConscript b/bsp/renesas/ra8d1-vision-board/ra/SConscript
index 52e96ac900d..82ebb7731c9 100644
--- a/bsp/renesas/ra8d1-vision-board/ra/SConscript
+++ b/bsp/renesas/ra8d1-vision-board/ra/SConscript
@@ -12,15 +12,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8d1-vision-board/ra_cfg/SConscript b/bsp/renesas/ra8d1-vision-board/ra_cfg/SConscript
index ff52ceb4fea..96725790df8 100644
--- a/bsp/renesas/ra8d1-vision-board/ra_cfg/SConscript
+++ b/bsp/renesas/ra8d1-vision-board/ra_cfg/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8d1-vision-board/ra_gen/SConscript b/bsp/renesas/ra8d1-vision-board/ra_gen/SConscript
index 6a52bcd6156..28ddea32732 100644
--- a/bsp/renesas/ra8d1-vision-board/ra_gen/SConscript
+++ b/bsp/renesas/ra8d1-vision-board/ra_gen/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8d1-vision-board/template.uvprojx b/bsp/renesas/ra8d1-vision-board/template.uvprojx
index 835f5975fa4..f3bdfad65d9 100644
--- a/bsp/renesas/ra8d1-vision-board/template.uvprojx
+++ b/bsp/renesas/ra8d1-vision-board/template.uvprojx
@@ -82,7 +82,7 @@
           <AfterMake>
             <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8m1-ek/SConscript b/bsp/renesas/ra8m1-ek/SConscript
index ba761a6dc6c..a722a3913e4 100644
--- a/bsp/renesas/ra8m1-ek/SConscript
+++ b/bsp/renesas/ra8m1-ek/SConscript
@@ -14,9 +14,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra8m1-ek/buildinfo.gpdsc b/bsp/renesas/ra8m1-ek/buildinfo.gpdsc
deleted file mode 100644
index feb125de3d7..00000000000
--- a/bsp/renesas/ra8m1-ek/buildinfo.gpdsc
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_5/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pac_armv81.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_5/LICENSE.txt"/>
-        <file category="header" name="ra/board/ra8m1_ek/board.h" path=""/>
-        <file category="header" name="ra/board/ra8m1_ek/board_ethernet_phy.h" path=""/>
-        <file category="source" name="ra/board/ra8m1_ek/board_init.c"/>
-        <file category="header" name="ra/board/ra8m1_ek/board_init.h" path=""/>
-        <file category="source" name="ra/board/ra8m1_ek/board_leds.c"/>
-        <file category="header" name="ra/board/ra8m1_ek/board_leds.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_transfer_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_uart_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_sci_b_uart.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7FA8M1AH.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="other" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_common.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_delay.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_guard.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_io.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_irq.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_security.o"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8m1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8m1/bsp_feature.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8m1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8m1/bsp_override.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="other" name="ra/fsp/src/r_ioport/r_ioport.o"/>
-        <file category="source" name="ra/fsp/src/r_sci_b_uart/r_sci_b_uart.c"/>
-        <file category="other" name="ra/fsp/src/r_sci_b_uart/r_sci_b_uart.o"/>
-        <file category="other" name="ra/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_b_uart_cfg.h" path=""/>
-        <file category="other" name="ra_cfg/SConscript"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="other" name="ra_gen/SConscript"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-        <file category="other" name="script/ac6/fsp_keep.via"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra8m1-ek/project.uvprojx b/bsp/renesas/ra8m1-ek/project.uvprojx
index fd83ccb988f..6c073904abc 100644
--- a/bsp/renesas/ra8m1-ek/project.uvprojx
+++ b/bsp/renesas/ra8m1-ek/project.uvprojx
@@ -77,9 +77,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
-              <Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_ARMLIBC</Define>
+              <Define>RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define>
               <Undefine />
-              <IncludePath>..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\libcpu\arm\cortex-m85;.;..\..\..\components\net\utest;board;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\io\epoll;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\components\drivers\include;..\..\..\include;..\..\..\components\finsh;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\eventfd;board\ports;..\..\..\components\drivers\phy;..\..\..\components\libc\compilers\common\extension;board\ports\wifi;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\include</IncludePath>
+              <IncludePath>..\..\..\libcpu\arm\cortex-m85;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;board\ports\wifi;.;..\..\..\components\libc\compilers\common\include;ra_gen;..\libraries\HAL_Drivers\drivers;ra\fsp\inc;ra_cfg\fsp_cfg\bsp;..\..\..\libcpu\arm\common;..\..\..\components\drivers\phy;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra\fsp\inc\instances;..\..\..\components\finsh;board\ports;ra\fsp\inc\api;..\..\..\components\drivers\include;..\..\..\components\net\utest;..\..\..\components\libc\posix\io\poll;..\..\..\include;..\..\..\components\libc\posix\io\epoll;board;..\libraries\HAL_Drivers\drivers\config;ra\arm\CMSIS_5\CMSIS\Core\Include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra_cfg\fsp_cfg;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1120,17 +1130,156 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>ra</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_rom_registers.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_rom_registers.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_b_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_b_uart\r_sci_b_uart.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>ra_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8m1-ek/ra/SConscript b/bsp/renesas/ra8m1-ek/ra/SConscript
index 52e96ac900d..82ebb7731c9 100644
--- a/bsp/renesas/ra8m1-ek/ra/SConscript
+++ b/bsp/renesas/ra8m1-ek/ra/SConscript
@@ -12,15 +12,14 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
-                    cwd + '/fsp/inc',
-                    cwd + '/fsp/inc/api',
-                    cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core/Include',
+                cwd + '/fsp/inc',
+                cwd + '/fsp/inc/api',
+                cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('ra', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8m1-ek/ra_cfg/SConscript b/bsp/renesas/ra8m1-ek/ra_cfg/SConscript
index ff52ceb4fea..96725790df8 100644
--- a/bsp/renesas/ra8m1-ek/ra_cfg/SConscript
+++ b/bsp/renesas/ra8m1-ek/ra_cfg/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('ra_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8m1-ek/ra_gen/SConscript b/bsp/renesas/ra8m1-ek/ra_gen/SConscript
index 6a52bcd6156..28ddea32732 100644
--- a/bsp/renesas/ra8m1-ek/ra_gen/SConscript
+++ b/bsp/renesas/ra8m1-ek/ra_gen/SConscript
@@ -12,9 +12,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('ra_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8m1-ek/template.uvprojx b/bsp/renesas/ra8m1-ek/template.uvprojx
index eacae611135..c6664d60271 100644
--- a/bsp/renesas/ra8m1-ek/template.uvprojx
+++ b/bsp/renesas/ra8m1-ek/template.uvprojx
@@ -80,9 +80,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c "start "Renesas" /w cmd /c ""$Slauncher\rasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out"""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target 1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8p1-titan-board/SConscript b/bsp/renesas/ra8p1-titan-board/SConscript
index ba761a6dc6c..a722a3913e4 100644
--- a/bsp/renesas/ra8p1-titan-board/SConscript
+++ b/bsp/renesas/ra8p1-titan-board/SConscript
@@ -14,9 +14,8 @@ if rtconfig.PLATFORM in ['iccarm']:
     print("\nThe current project does not support IAR build\n")
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/ra8p1-titan-board/buildinfo.gpdsc b/bsp/renesas/ra8p1-titan-board/buildinfo.gpdsc
deleted file mode 100644
index 790d451e89a..00000000000
--- a/bsp/renesas/ra8p1-titan-board/buildinfo.gpdsc
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<package xmlns:xs="http://www.w3.org/2001/XMLSchema-instance">
-  <vendor>Renesas</vendor>
-  <name>Project Content</name>
-  <description>Project content managed by the Renesas Smart Configurator</description>
-  <url/>
-  <releases>
-    <release version="1.0.0"/>
-  </releases>
-  <generators>
-    <generator id="Renesas RA Smart Configurator">
-      <project_files>
-        <file category="include" name="src/"/>
-        <file category="source" name="src/hal_entry.c"/>
-      </project_files>
-    </generator>
-  </generators>
-  <components generator="Renesas RA Smart Configurator">
-    <component Cclass="Flex Software" Cgroup="Components" Csub="ra">
-      <files>
-        <file category="include" name="ra/arm/CMSIS_6/CMSIS/Core/Include/"/>
-        <file category="include" name="ra/fsp/inc/"/>
-        <file category="include" name="ra/fsp/inc/api/"/>
-        <file category="include" name="ra/fsp/inc/instances/"/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_armclang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_clang_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_cp15.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_gcc_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/cmsis_iccarm_a.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/a-profile/irq_ctrl.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_armclang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_clang.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_compiler.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_gcc.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/cmsis_version.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_ca.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm0plus.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm23.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm3.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm33.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm35p.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm4.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm52.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm55.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm7.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_cm85.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc000.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_sc300.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/core_starmc1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_cachel1.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv7m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv81m_pac.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_mpu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/armv8m_pmu.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_armclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_clang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_gcc_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_iccarm_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/m-profile/cmsis_tiarmclang_m.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_armclang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_clang_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/r-profile/cmsis_gcc_r.h" path=""/>
-        <file category="header" name="ra/arm/CMSIS_6/CMSIS/Core/Include/tz_context.h" path=""/>
-        <file category="other" name="ra/arm/CMSIS_6/LICENSE"/>
-        <file category="header" name="ra/fsp/inc/api/bsp_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/fsp_common_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/api/r_ioport_api.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_features.h" path=""/>
-        <file category="header" name="ra/fsp/inc/fsp_version.h" path=""/>
-        <file category="header" name="ra/fsp/inc/instances/r_ioport.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7KA8P1KF_core0.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/R7KA8P1KF_core1.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
-        <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_clocks.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_common.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_common.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_delay.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_delay.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_exceptions.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_group_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_guard.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_guard.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_io.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_io.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_ipc.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_irq.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_irq.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_macl.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_macl.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_mmf.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_module_stop.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_sdram.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_security.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_tfu.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_elc.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_feature.h" path=""/>
-        <file category="source" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_linker.c"/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_mcu_info.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_override.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/bsp_peripheral.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/r_adc_device_types.h" path=""/>
-        <file category="header" name="ra/fsp/src/bsp/mcu/ra8p1/r_lpm_device_types.h" path=""/>
-        <file category="source" name="ra/fsp/src/r_ioport/r_ioport.c"/>
-        <file category="source" name="ra/fsp/src/r_sci_b_uart/r_sci_b_uart.c"/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Build Configuration">
-      <files>
-        <file category="include" name="ra_cfg/fsp_cfg/"/>
-        <file category="include" name="ra_cfg/fsp_cfg/bsp/"/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/board_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_mcu_ofs_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_ioport_cfg.h" path=""/>
-        <file category="header" name="ra_cfg/fsp_cfg/r_sci_b_uart_cfg.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Generated Data">
-      <files>
-        <file category="include" name="ra_gen/"/>
-        <file category="header" name="ra_gen/bsp_clock_cfg.h" path=""/>
-        <file category="source" name="ra_gen/common_data.c"/>
-        <file category="header" name="ra_gen/common_data.h" path=""/>
-        <file category="source" name="ra_gen/hal_data.c"/>
-        <file category="header" name="ra_gen/hal_data.h" path=""/>
-        <file category="source" name="ra_gen/main.c"/>
-        <file category="source" name="ra_gen/pin_data.c"/>
-        <file category="source" name="ra_gen/vector_data.c"/>
-        <file category="header" name="ra_gen/vector_data.h" path=""/>
-      </files>
-    </component>
-    <component Cclass="Flex Software" Cgroup="Linker Script">
-      <files>
-        <file category="linkerScript" name="script/fsp.scat"/>
-      </files>
-    </component>
-  </components>
-</package>
diff --git a/bsp/renesas/ra8p1-titan-board/project.uvprojx b/bsp/renesas/ra8p1-titan-board/project.uvprojx
index baae5a96883..f6cfee7042a 100644
--- a/bsp/renesas/ra8p1-titan-board/project.uvprojx
+++ b/bsp/renesas/ra8p1-titan-board/project.uvprojx
@@ -67,9 +67,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -77,9 +77,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name />
             <UserProg2Name />
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -335,9 +335,9 @@
             <v6Rtti>0</v6Rtti>
             <VariousControls>
               <MiscControls />
-              <Define>__RTTHREAD__, _RA_CORE=0, __CLK_TCK=RT_TICK_PER_SECOND, RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS</Define>
+              <Define>__STDC_LIMIT_MACROS, __RTTHREAD__, _RA_CORE=0, RT_USING_ARMLIBC, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND</Define>
               <Undefine />
-              <IncludePath>..\libraries\HAL_Drivers\drivers\config;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra\tes\dave2d\inc;..\..\..\components\net\utest;..\..\..\libcpu\arm\cortex-m85;..\..\..\components\drivers\include;board\ports;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\include;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\posix\io\epoll;..\libraries\HAL_Drivers\drivers;..\..\..\libcpu\arm\common;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\include;board;ra\fsp\src\r_vin;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;.;ra\fsp\src\r_mipi_csi;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\drivers\include</IncludePath>
+              <IncludePath>..\..\..\components\libc\posix\io\poll;..\..\..\components\drivers\phy;..\..\..\components\drivers\smp_call;..\..\..\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\drivers\include;board\ports;..\..\..\components\drivers\include;ra\fsp\src\r_vin;ra\fsp\inc\api;..\..\..\libcpu\arm\cortex-m85;ra_gen;..\libraries\HAL_Drivers;board;..\..\..\components\drivers\include;..\..\..\components\drivers\include;ra\fsp\inc;..\..\..\components\libc\posix\io\eventfd;ra_cfg\fsp_cfg\bsp;..\..\..\libcpu\arm\common;..\..\..\components\libc\compilers\common\extension\fcntl\octal;ra\fsp\src\rm_ethosu;ra\npu\ethos-u-core-driver\include;ra\tes\dave2d\inc;..\..\..\components\finsh;ra\fsp\src\r_mipi_csi;ra_cfg\fsp_cfg;..\..\..\components\libc\compilers\common\extension;..\..\..\components\drivers\include;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\posix\io\epoll;ra\arm\CMSIS_6\CMSIS\Core\Include;..\..\..\components\drivers\include;.;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\net\utest;ra\fsp\inc\instances</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -350,9 +350,9 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>4</ClangAsOpt>
+            <ClangAsOpt>2</ClangAsOpt>
             <VariousControls>
-              <MiscControls>--via=via/rasc_armasm.via</MiscControls>
+              <MiscControls />
               <Define />
               <Undefine />
               <IncludePath />
@@ -378,6 +378,16 @@
         </TargetArmAds>
       </TargetOption>
       <Groups>
+        <Group>
+          <GroupName>Applications</GroupName>
+          <Files>
+            <File>
+              <FileName>hal_entry.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>src\hal_entry.c</FilePath>
+            </File>
+          </Files>
+        </Group>
         <Group>
           <GroupName>CPU</GroupName>
           <Files>
@@ -1110,17 +1120,268 @@
             </File>
           </Files>
         </Group>
+        <Group>
+          <GroupName>RA</GroupName>
+          <Files>
+            <File>
+              <FileName>bsp_clocks.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_clocks.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_common.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_common.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_delay.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_delay.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_group_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_group_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_guard.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_guard.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_io.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_io.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ipc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ipc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_irq.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_irq.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_macl.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_macl.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_ospi_b.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_ospi_b.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_register_protection.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_register_protection.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sbrk.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sbrk.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_sdram.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_sdram.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_security.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\all\bsp_security.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>bsp_linker.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\mcu\ra8p1\bsp_linker.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>system.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\system.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>startup.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\bsp\cmsis\Device\RENESAS\Source\startup.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_adc_b.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_adc_b\r_adc_b.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_canfd.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_canfd\r_canfd.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_dmac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_dmac\r_dmac.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_gpt.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_gpt\r_gpt.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_iic_master.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_iic_master\r_iic_master.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ioport.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ioport\r_ioport.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_layer3_switch.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_layer3_switch\r_layer3_switch.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_ospi_b.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_ospi_b\r_ospi_b.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_rmac.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_rmac\r_rmac.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_rmac_phy.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_rmac_phy\r_rmac_phy.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_rtc\r_rtc.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sci_b_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sci_b_uart\r_sci_b_uart.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_sdhi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_sdhi\r_sdhi.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>r_spi_b.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra\fsp\src\r_spi_b\r_spi_b.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>RA_gen</GroupName>
+          <Files>
+            <File>
+              <FileName>common_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\common_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>hal_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\hal_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>main.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\main.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>pin_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\pin_data.c</FilePath>
+            </File>
+          </Files>
+          <Files>
+            <File>
+              <FileName>vector_data.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>ra_gen\vector_data.c</FilePath>
+            </File>
+          </Files>
+        </Group>
       </Groups>
     </Target>
   </Targets>
   <RTE>
-    <gpdscs>
-      <gpdsc generator="Renesas RA Smart Configurator" name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1" />
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis />
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/ra8p1-titan-board/ra/SConscript b/bsp/renesas/ra8p1-titan-board/ra/SConscript
index 0588e0abcb2..fcb234ff98d 100644
--- a/bsp/renesas/ra8p1-titan-board/ra/SConscript
+++ b/bsp/renesas/ra8p1-titan-board/ra/SConscript
@@ -9,26 +9,25 @@ group = []
 CPPPATH = []
 
 if rtconfig.PLATFORM in ['iccarm'] + GetGCCLikePLATFORM():
-    if rtconfig.PLATFORM == 'iccarm' or GetOption('target') != 'mdk5':
-        src += Glob('./fsp/src/bsp/mcu/all/*.c')
-        src += Glob('./fsp/src/bsp/mcu/ra8p1/*.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c')
-        src += Glob('./fsp/src/r_*/*.c')
-        src += Glob('./npu/ethos-u-core-driver/src/*.c')
-        src += Glob('./fsp/src/rm_ethosu/*.c')
-        
-        CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
-                            cwd + '/fsp/inc',
-                            cwd + '/fsp/inc/api',
-                            cwd + '/fsp/inc/instances',
-                            cwd + '/fsp/src/rm_ethosu',
-                            cwd + '/npu/ethos-u-core-driver/include',
-                  ]
+    src += Glob('./fsp/src/bsp/mcu/all/*.c')
+    src += Glob('./fsp/src/bsp/mcu/ra8p1/*.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c')
+    src += Glob('./fsp/src/r_*/*.c')
+    src += Glob('./npu/ethos-u-core-driver/src/*.c')
+    src += Glob('./fsp/src/rm_ethosu/*.c')
+
+    CPPPATH = [ cwd + '/arm/CMSIS_6/CMSIS/Core/Include',
+                        cwd + '/fsp/inc',
+                        cwd + '/fsp/inc/api',
+                        cwd + '/fsp/inc/instances',
+                        cwd + '/fsp/src/rm_ethosu',
+                        cwd + '/npu/ethos-u-core-driver/include',
+              ]
 
     if GetDepend('BSP_USING_G2D'):
         src += Glob(cwd + '/tes/dave2d/src/*.c')
-	
+
     if GetDepend('BSP_USING_RA8P1_USB'):
         src += Glob('./fsp/src/r_usb_basic/src/driver/*.c')
         src += Glob('./fsp/src/r_usb_basic/src/hw/*.c')
@@ -48,7 +47,7 @@ if rtconfig.PLATFORM in ['iccarm'] + GetGCCLikePLATFORM():
         src += Glob('./fsp/src/r_vin/*.c')
         CPPPATH += [cwd + '/fsp/src/r_mipi_csi']
         CPPPATH += [cwd + '/fsp/src/r_vin']
-	
+
     CPPPATH += [
     	cwd + '/tes/dave2d/inc',
     	cwd + '/fsp/src/r_mipi_csi',
diff --git a/bsp/renesas/ra8p1-titan-board/ra_cfg/SConscript b/bsp/renesas/ra8p1-titan-board/ra_cfg/SConscript
index 606e247f678..a20b1173946 100644
--- a/bsp/renesas/ra8p1-titan-board/ra_cfg/SConscript
+++ b/bsp/renesas/ra8p1-titan-board/ra_cfg/SConscript
@@ -9,9 +9,8 @@ group = []
 CPPPATH = []
 
 if rtconfig.PLATFORM in ['iccarm'] + GetGCCLikePLATFORM():
-    if rtconfig.PLATFORM == 'iccarm' or GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('RA_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8p1-titan-board/ra_gen/SConscript b/bsp/renesas/ra8p1-titan-board/ra_gen/SConscript
index 4f8b2ea0332..e414161de51 100644
--- a/bsp/renesas/ra8p1-titan-board/ra_gen/SConscript
+++ b/bsp/renesas/ra8p1-titan-board/ra_gen/SConscript
@@ -9,9 +9,8 @@ group = []
 CPPPATH = []
 
 if rtconfig.PLATFORM in ['iccarm'] + GetGCCLikePLATFORM():
-    if rtconfig.PLATFORM == 'iccarm' or GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('RA_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/ra8p1-titan-board/template.uvprojx b/bsp/renesas/ra8p1-titan-board/template.uvprojx
index 0b1929662a9..3a4dd2203ee 100644
--- a/bsp/renesas/ra8p1-titan-board/template.uvprojx
+++ b/bsp/renesas/ra8p1-titan-board/template.uvprojx
@@ -70,9 +70,9 @@
             <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --generate --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" 2&gt; "%%TEMP%%\rasc_stderr.out" &amp;&amp; echo. &gt; "$Poutput.rasc""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -80,9 +80,9 @@
             <nStopB2X>0</nStopB2X>
           </BeforeMake>
           <AfterMake>
-            <RunUserProg1>1</RunUserProg1>
+            <RunUserProg1>0</RunUserProg1>
             <RunUserProg2>0</RunUserProg2>
-            <UserProg1Name>cmd /c ""$Prasc_launcher.bat" "$Prasc_version.txt" -nosplash --launcher.suppressErrors --gensmartbundle --compiler ARMv6 --devicefamily ra "$Pconfiguration.xml" "$L%L" 2&gt; "%%TEMP%%\rasc_stderr.out""</UserProg1Name>
+            <UserProg1Name></UserProg1Name>
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
@@ -353,9 +353,9 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <ClangAsOpt>4</ClangAsOpt>
+            <ClangAsOpt>2</ClangAsOpt>
             <VariousControls>
-              <MiscControls>--via=via/rasc_armasm.via</MiscControls>
+              <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
@@ -374,7 +374,7 @@
             <ScatterFile>.\script\fsp.scat</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
-            <Misc>--via=via/rasc_armlink.via</Misc>
+            <Misc></Misc>
             <LinkerInputFile></LinkerInputFile>
             <DisabledWarnings></DisabledWarnings>
           </LDads>
@@ -402,13 +402,6 @@
   </Targets>
 
   <RTE>
-    <gpdscs>
-      <gpdsc generator="Renesas RA Smart Configurator" name="buildinfo.gpdsc">
-        <targetInfos>
-          <targetInfo name="Target_1"/>
-        </targetInfos>
-      </gpdsc>
-    </gpdscs>
     <apis/>
     <components>
       <component Cclass="Flex Software" Cgroup="RA Configuration" Cvendor="Renesas" Cversion="1.0.0" condition="RA Device" generator="Renesas RA Smart Configurator">
diff --git a/bsp/renesas/rzn2l_etherkit/SConscript b/bsp/renesas/rzn2l_etherkit/SConscript
index db0ef9c0cb5..e95d4e558dd 100644
--- a/bsp/renesas/rzn2l_etherkit/SConscript
+++ b/bsp/renesas/rzn2l_etherkit/SConscript
@@ -14,10 +14,9 @@ list = os.listdir(cwd)
 if rtconfig.PLATFORM in ['iccarm']:
     group = DefineGroup('', src, depend = [''], CPPPATH = CPPPATH)
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
-        group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
+    group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
 for d in list:
     path = os.path.join(cwd, d)
diff --git a/bsp/renesas/rzn2l_etherkit/rzn/SConscript b/bsp/renesas/rzn2l_etherkit/rzn/SConscript
index 4ff6ec8599e..7088d38b3c2 100644
--- a/bsp/renesas/rzn2l_etherkit/rzn/SConscript
+++ b/bsp/renesas/rzn2l_etherkit/rzn/SConscript
@@ -11,17 +11,16 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob('./fsp/src/bsp/mcu/all/*.c')
-        src += Glob('./fsp/src/bsp/mcu/all/cr/*.c')
-        src += Glob('./fsp/src/bsp/mcu/r*/*.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/*.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
-        src += Glob('./fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
-                            cwd + '/fsp/inc',
-                            cwd + '/fsp/inc/api',
-                            cwd + '/fsp/inc/instances',]
+    src += Glob('./fsp/src/bsp/mcu/all/*.c')
+    src += Glob('./fsp/src/bsp/mcu/all/cr/*.c')
+    src += Glob('./fsp/src/bsp/mcu/r*/*.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/*.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
+    src += Glob('./fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
+                        cwd + '/fsp/inc',
+                        cwd + '/fsp/inc/api',
+                        cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('rzn', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzn2l_etherkit/rzn_cfg/SConscript b/bsp/renesas/rzn2l_etherkit/rzn_cfg/SConscript
index 8d63460c645..7226872998a 100644
--- a/bsp/renesas/rzn2l_etherkit/rzn_cfg/SConscript
+++ b/bsp/renesas/rzn2l_etherkit/rzn_cfg/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('rz_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzn2l_etherkit/rzn_gen/SConscript b/bsp/renesas/rzn2l_etherkit/rzn_gen/SConscript
index 33e4f94e073..a2387831706 100644
--- a/bsp/renesas/rzn2l_etherkit/rzn_gen/SConscript
+++ b/bsp/renesas/rzn2l_etherkit/rzn_gen/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('rz_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzn2l_rsk/SConscript b/bsp/renesas/rzn2l_rsk/SConscript
index db0ef9c0cb5..e95d4e558dd 100644
--- a/bsp/renesas/rzn2l_rsk/SConscript
+++ b/bsp/renesas/rzn2l_rsk/SConscript
@@ -14,10 +14,9 @@ list = os.listdir(cwd)
 if rtconfig.PLATFORM in ['iccarm']:
     group = DefineGroup('', src, depend = [''], CPPPATH = CPPPATH)
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
-        group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
+    group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
 for d in list:
     path = os.path.join(cwd, d)
diff --git a/bsp/renesas/rzn2l_rsk/rzn/SConscript b/bsp/renesas/rzn2l_rsk/rzn/SConscript
index 4ff6ec8599e..7088d38b3c2 100644
--- a/bsp/renesas/rzn2l_rsk/rzn/SConscript
+++ b/bsp/renesas/rzn2l_rsk/rzn/SConscript
@@ -11,17 +11,16 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob('./fsp/src/bsp/mcu/all/*.c')
-        src += Glob('./fsp/src/bsp/mcu/all/cr/*.c')
-        src += Glob('./fsp/src/bsp/mcu/r*/*.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/*.c')
-        src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
-        src += Glob('./fsp/src/r_*/*.c')
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
-                            cwd + '/fsp/inc',
-                            cwd + '/fsp/inc/api',
-                            cwd + '/fsp/inc/instances',]
+    src += Glob('./fsp/src/bsp/mcu/all/*.c')
+    src += Glob('./fsp/src/bsp/mcu/all/cr/*.c')
+    src += Glob('./fsp/src/bsp/mcu/r*/*.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/*.c')
+    src += Glob('./fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
+    src += Glob('./fsp/src/r_*/*.c')
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
+                        cwd + '/fsp/inc',
+                        cwd + '/fsp/inc/api',
+                        cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('rzn', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzn2l_rsk/rzn_cfg/SConscript b/bsp/renesas/rzn2l_rsk/rzn_cfg/SConscript
index 8d63460c645..7226872998a 100644
--- a/bsp/renesas/rzn2l_rsk/rzn_cfg/SConscript
+++ b/bsp/renesas/rzn2l_rsk/rzn_cfg/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('rz_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzn2l_rsk/rzn_gen/SConscript b/bsp/renesas/rzn2l_rsk/rzn_gen/SConscript
index 33e4f94e073..a2387831706 100644
--- a/bsp/renesas/rzn2l_rsk/rzn_gen/SConscript
+++ b/bsp/renesas/rzn2l_rsk/rzn_gen/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('rz_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzt2m_rsk/SConscript b/bsp/renesas/rzt2m_rsk/SConscript
index 889ba12c85f..1c6afbb2923 100644
--- a/bsp/renesas/rzt2m_rsk/SConscript
+++ b/bsp/renesas/rzt2m_rsk/SConscript
@@ -14,9 +14,8 @@ list = os.listdir(cwd)
 if rtconfig.PLATFORM in ['iccarm']:
     group = DefineGroup('', src, depend = [''], CPPPATH = CPPPATH)
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        CPPPATH = [cwd]
-        src = Glob('./src/*.c')
+    CPPPATH = [cwd]
+    src = Glob('./src/*.c')
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
diff --git a/bsp/renesas/rzt2m_rsk/rzt/SConscript b/bsp/renesas/rzt2m_rsk/rzt/SConscript
index a740db16aaf..efca77d3f85 100644
--- a/bsp/renesas/rzt2m_rsk/rzt/SConscript
+++ b/bsp/renesas/rzt2m_rsk/rzt/SConscript
@@ -11,18 +11,17 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
-        src += Glob(cwd + '/fsp/src/bsp/mcu/all/cr/*.c')
-        src += Glob(cwd + '/fsp/src/bsp/mcu/r*/*.c')
-        src += Glob(cwd + '/fsp/src/r_*/*.c')
-        src += Glob(cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
-        src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
-        CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
-                            cwd + '/fsp/inc',
-                            cwd + '/fsp/inc/api',
-                            cwd + '/fsp/inc/instances',]
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/mcu/all/cr/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/mcu/r*/*.c')
+    src += Glob(cwd + '/fsp/src/r_*/*.c')
+    src += Glob(cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/cr/*.c')
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c']
+    src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c']
+    CPPPATH = [ cwd + '/arm/CMSIS_5/CMSIS/Core_R/Include',
+                        cwd + '/fsp/inc',
+                        cwd + '/fsp/inc/api',
+                        cwd + '/fsp/inc/instances',]
 
 group = DefineGroup('rzt', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzt2m_rsk/rzt_cfg/SConscript b/bsp/renesas/rzt2m_rsk/rzt_cfg/SConscript
index 8d63460c645..7226872998a 100644
--- a/bsp/renesas/rzt2m_rsk/rzt_cfg/SConscript
+++ b/bsp/renesas/rzt2m_rsk/rzt_cfg/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
+    src = Glob('*.c')
+    CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp']
 
 group += DefineGroup('rz_cfg', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')
diff --git a/bsp/renesas/rzt2m_rsk/rzt_gen/SConscript b/bsp/renesas/rzt2m_rsk/rzt_gen/SConscript
index 33e4f94e073..a2387831706 100644
--- a/bsp/renesas/rzt2m_rsk/rzt_gen/SConscript
+++ b/bsp/renesas/rzt2m_rsk/rzt_gen/SConscript
@@ -11,9 +11,8 @@ CPPPATH = []
 if rtconfig.PLATFORM in ['iccarm']:
     Return('group')
 elif rtconfig.PLATFORM in GetGCCLikePLATFORM():
-    if GetOption('target') != 'mdk5':
-        src = Glob('*.c')
-        CPPPATH = [cwd, ]
+    src = Glob('*.c')
+    CPPPATH = [cwd, ]
 
 group = DefineGroup('rz_gen', src, depend = [''], CPPPATH = CPPPATH)
 Return('group')