From b5e84d26c26c47f41e77d8f7fb4f4e2ffb25c1cf Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Tue, 10 Dec 2024 21:49:08 +0700
Subject: [PATCH] change ra bsp to match fsp generated directory

---
 .../portenta_c33/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../portenta_c33/ra_cfg/fsp_cfg}/r_ioport_cfg.h     |  6 ++++++
 .../{fsp_cfg => ra_gen}/bsp_clock_cfg.h             |  0
 .../ra2a1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h     |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../boards/ra2a1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 +++++++++++++
 .../ra2a1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h    |  0
 .../ra4m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h     |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../boards/ra4m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 +++++++++++++
 .../ra4m1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h    |  0
 .../ra4m3_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h     |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../boards/ra4m3_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 +++++++++++++
 .../ra4m3_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h    |  0
 .../ra6m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h     |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../boards/ra6m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 +++++++++++++
 .../ra6m1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h    |  0
 hw/bsp/ra/boards/ra6m5_ek/board.cmake               |  1 +
 .../ra6m5_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h     |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../boards/ra6m5_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h   | 13 +++++++++++++
 .../ra6m5_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h    |  0
 .../uno_r4/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h       |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |  0
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h             |  0
 .../{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |  0
 .../ra/boards/uno_r4/ra_cfg/fsp_cfg/r_ioport_cfg.h  | 13 +++++++++++++
 .../uno_r4/{fsp_cfg => ra_gen}/bsp_clock_cfg.h      |  0
 hw/bsp/ra/family.cmake                              |  5 +++--
 44 files changed, 88 insertions(+), 2 deletions(-)
 rename hw/bsp/ra/boards/portenta_c33/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/portenta_c33/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/portenta_c33/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/portenta_c33/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 rename hw/bsp/ra/{ => boards/portenta_c33/ra_cfg/fsp_cfg}/r_ioport_cfg.h (75%)
 rename hw/bsp/ra/boards/portenta_c33/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/ra2a1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/ra2a1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/ra2a1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/ra2a1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/ra2a1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/ra4m1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m3_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m3_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m3_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/ra4m3_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/ra4m3_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m1_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/ra6m1_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m5_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m5_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m5_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/ra6m5_ek/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/ra6m5_ek/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)
 rename hw/bsp/ra/boards/uno_r4/{ => ra_cfg}/fsp_cfg/bsp/bsp_cfg.h (100%)
 rename hw/bsp/ra/boards/uno_r4/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_cfg.h (100%)
 rename hw/bsp/ra/boards/uno_r4/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h (100%)
 rename hw/bsp/ra/boards/uno_r4/{ => ra_cfg}/fsp_cfg/bsp/bsp_mcu_family_cfg.h (100%)
 create mode 100644 hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/r_ioport_cfg.h
 rename hw/bsp/ra/boards/uno_r4/{fsp_cfg => ra_gen}/bsp_clock_cfg.h (100%)

diff --git a/hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/r_ioport_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/r_ioport_cfg.h
similarity index 75%
rename from hw/bsp/ra/r_ioport_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/r_ioport_cfg.h
index cb7c07932..d2688bf5b 100644
--- a/hw/bsp/ra/r_ioport_cfg.h
+++ b/hw/bsp/ra/boards/portenta_c33/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -1,7 +1,13 @@
 /* generated configuration header file - do not edit */
 #ifndef R_IOPORT_CFG_H_
 #define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/portenta_c33/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/portenta_c33/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/portenta_c33/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/ra2a1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/ra2a1_ek/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra2a1_ek/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/ra2a1_ek/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/ra4m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/ra4m1_ek/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m1_ek/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/ra4m1_ek/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/ra4m3_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/ra4m3_ek/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra4m3_ek/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/ra4m3_ek/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/ra6m1_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/ra6m1_ek/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m1_ek/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/ra6m1_ek/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m5_ek/board.cmake b/hw/bsp/ra/boards/ra6m5_ek/board.cmake
index c91d48a32..2adf6e744 100644
--- a/hw/bsp/ra/boards/ra6m5_ek/board.cmake
+++ b/hw/bsp/ra/boards/ra6m5_ek/board.cmake
@@ -2,6 +2,7 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m33 CACHE INTERNAL "System Processor")
 set(MCU_VARIANT ra6m5)
 
 set(JLINK_DEVICE R7FA6M5BH)
+set(JLINK_OPTION "-USB 000831915224")
 
 # Device port default to PORT1 Highspeed
 if (NOT DEFINED PORT)
diff --git a/hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/ra6m5_ek/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/ra6m5_ek/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/ra6m5_ek/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/ra6m5_ek/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_cfg.h
rename to hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_device_cfg.h
rename to hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
rename to hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_mcu_family_cfg.h
rename to hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 000000000..d2688bf5b
--- /dev/null
+++ b/hw/bsp/ra/boards/uno_r4/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,13 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp_clock_cfg.h b/hw/bsp/ra/boards/uno_r4/ra_gen/bsp_clock_cfg.h
similarity index 100%
rename from hw/bsp/ra/boards/uno_r4/fsp_cfg/bsp_clock_cfg.h
rename to hw/bsp/ra/boards/uno_r4/ra_gen/bsp_clock_cfg.h
diff --git a/hw/bsp/ra/family.cmake b/hw/bsp/ra/family.cmake
index 426e1ca8f..3b35d2e71 100644
--- a/hw/bsp/ra/family.cmake
+++ b/hw/bsp/ra/family.cmake
@@ -44,8 +44,9 @@ function(add_board_target BOARD_TARGET)
     target_include_directories(${BOARD_TARGET} PUBLIC
       ${CMAKE_CURRENT_FUNCTION_LIST_DIR}
       ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
-      ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/fsp_cfg
-      ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/fsp_cfg/bsp
+      ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/ra_cfg/fsp_cfg
+      ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/ra_cfg/fsp_cfg/bsp
+      ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}/ra_gen
       ${CMSIS_DIR}/CMSIS/Core/Include
       ${FSP_RA}/inc
       ${FSP_RA}/inc/api