diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index c49db286fd3a..13be532cb239 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -91,6 +91,7 @@ CROSS_COMPILE ?= arm-none-eabi-
 
 INC += -imacros boards/compiler_barrier.h
 INC += -I.
+INC += -Ifsp_cfg
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(TOP)/$(CMSIS_DIR)
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068a..000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
deleted file mode 100644
index 7f285caced82..000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_LP_CFG_H_
-#define R_FLASH_LP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLASH_LP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define FLASH_LP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
-#define FLASH_LP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba39..000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172..000000000000
--- a/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068a..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba39..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068a..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
deleted file mode 100644
index 9f7819b71a41..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_HP_CFG_H_
-#define R_FLASH_HP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLASH_HP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define FLASH_HP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
-#define FLASH_HP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_HP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba39..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172..000000000000
--- a/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
deleted file mode 100644
index be8a4272068a..000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_ADC_CFG_H_
-#define R_ADC_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
deleted file mode 100644
index 7f285caced82..000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_FLASH_LP_CFG_H_
-#define R_FLASH_LP_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FLASH_LP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define FLASH_LP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
-#define FLASH_LP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
deleted file mode 100644
index d2688bf5ba39..000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* 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/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
deleted file mode 100644
index 6712eee6a172..000000000000
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef R_LPM_CFG_H_
-#define R_LPM_CFG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
-#define LPM_CFG_STANDBY_LIMIT (0)
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/fsp_cfg/r_adc_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/fsp_cfg/r_flash_hp_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_flash_hp_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/fsp_cfg/r_flash_lp_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_flash_lp_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/fsp_cfg/r_ioport_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/fsp_cfg/r_lpm_cfg.h
similarity index 100%
rename from ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
rename to ports/renesas-ra/fsp_cfg/r_lpm_cfg.h