change ra bsp to match fsp generated directory

espressif · roma-jam · Jan 23, 2025 · Nov 2, 2024 · Nov 2, 2024 · Nov 2, 2024
commit b5e84d26c26c47f41e77d8f7fb4f4e2ffb25c1cf
diff --git a/...boards/portenta_c33/fsp_cfg/bsp/bsp_cfg.h → ...portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/...boards/portenta_c33/fsp_cfg/bsp/bsp_cfg.h → ...portenta_c33/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...enta_c33/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...3/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...enta_c33/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...3/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...a_c33/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...a_c33/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...enta_c33/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...3/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...enta_c33/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...3/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/hw/bsp/ra/r_ioport_cfg.h → ...ortenta_c33/ra_cfg/fsp_cfg/r_ioport_cfg.h b/hw/bsp/ra/r_ioport_cfg.h → ...ortenta_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/...ards/portenta_c33/fsp_cfg/bsp_clock_cfg.h → ...oards/portenta_c33/ra_gen/bsp_clock_cfg.h b/...ards/portenta_c33/fsp_cfg/bsp_clock_cfg.h → ...oards/portenta_c33/ra_gen/bsp_clock_cfg.h
diff --git a/.../ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/.../ra/boards/ra2a1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra2a1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...ra2a1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...a1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...a1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...ra2a1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...ra2a1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/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
@@ -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/...a/boards/ra2a1_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra2a1_ek/ra_gen/bsp_clock_cfg.h b/...a/boards/ra2a1_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra2a1_ek/ra_gen/bsp_clock_cfg.h
diff --git a/.../ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/.../ra/boards/ra4m1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra4m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...ra4m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...ra4m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...ra4m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/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
@@ -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/...a/boards/ra4m1_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra4m1_ek/ra_gen/bsp_clock_cfg.h b/...a/boards/ra4m1_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra4m1_ek/ra_gen/bsp_clock_cfg.h
diff --git a/.../ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/.../ra/boards/ra4m3_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra4m3_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...ra4m3_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...m3_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...m3_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...ra4m3_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...ra4m3_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/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
@@ -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/...a/boards/ra4m3_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra4m3_ek/ra_gen/bsp_clock_cfg.h b/...a/boards/ra4m3_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra4m3_ek/ra_gen/bsp_clock_cfg.h
diff --git a/.../ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/.../ra/boards/ra6m1_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra6m1_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...ra6m1_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...m1_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...ra6m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...ra6m1_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/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
@@ -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/...a/boards/ra6m1_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra6m1_ek/ra_gen/bsp_clock_cfg.h b/...a/boards/ra6m1_ek/fsp_cfg/bsp_clock_cfg.h → ...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
@@ -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/.../ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/.../ra/boards/ra6m5_ek/fsp_cfg/bsp/bsp_cfg.h → ...rds/ra6m5_ek/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...ra6m5_ek/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...m5_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...m5_ek/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...ra6m5_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...ra6m5_ek/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...k/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
@@ -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/...a/boards/ra6m5_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra6m5_ek/ra_gen/bsp_clock_cfg.h b/...a/boards/ra6m5_ek/fsp_cfg/bsp_clock_cfg.h → ...ra/boards/ra6m5_ek/ra_gen/bsp_clock_cfg.h
diff --git a/...sp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_cfg.h → ...oards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/...sp/ra/boards/uno_r4/fsp_cfg/bsp/bsp_cfg.h → ...oards/uno_r4/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/...s/uno_r4/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/...s/uno_r4/fsp_cfg/bsp/bsp_mcu_device_cfg.h → ...4/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/...no_r4/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/...no_r4/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h → ...a_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/...s/uno_r4/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...4/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/...s/uno_r4/fsp_cfg/bsp/bsp_mcu_family_cfg.h → ...4/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
@@ -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/.../ra/boards/uno_r4/fsp_cfg/bsp_clock_cfg.h → ...p/ra/boards/uno_r4/ra_gen/bsp_clock_cfg.h b/.../ra/boards/uno_r4/fsp_cfg/bsp_clock_cfg.h → ...p/ra/boards/uno_r4/ra_gen/bsp_clock_cfg.h
diff --git 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