Merge remote-tracking branch 'remotes/origin/ra6m4-cpk-3.5.0'

# Conflicts:
#	bsp/ra6m4-cpk/.settings/standalone.prefs
#	bsp/ra6m4-cpk/SConscript
#	bsp/renesas/ra6m4-cpk/ra_gen/vector_data.h
#	bsp/renesas/ra6m4-iot/buildinfo.gpdsc
#	bsp/renesas/ra6m4-iot/project.uvoptx
#	bsp/renesas/ra6m4-iot/project.uvprojx
#	bsp/renesas/ra6m4-iot/ra/fsp/inc/api/r_external_irq_api.h
#	bsp/renesas/ra6m4-iot/ra_gen/SConscript

bsp/ra6m4-cpk/.settings/standalone.prefs

@@ -1,21 +0,0 @@
-#Tue Dec 14 18:35:25 CST 2021
-com.renesas.cdt.ddsc.content/com.renesas.cdt.ddsc.content.defaultlinkerscript=script/fsp.scat
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_ioport\#\#\#\#3.1.0/all=1957950123,ra/fsp/inc/api/r_ioport_api.h|1390983687,ra/fsp/inc/instances/r_ioport.h|3204787724,ra/fsp/src/r_ioport/r_ioport.c
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_sci_uart\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_icu\#\#\#\#3.1.0/all=2545672180,ra/fsp/inc/instances/r_icu.h|1906465970,ra/fsp/inc/api/r_external_irq_api.h|3018483678,ra/fsp/src/r_icu/r_icu.c
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#Board\#\#ra6m4_cpk\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#\#\#3.1.0/all=2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.1.0/all=2920829723,ra/fsp/src/bsp/mcu/all/bsp_guard.c|2247478812,ra/fsp/src/bsp/mcu/all/bsp_module_stop.h|521902797,ra/fsp/src/bsp/mcu/all/bsp_security.h|2966752275,ra/fsp/src/bsp/mcu/all/bsp_delay.c|2977689308,ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h|1982083345,ra/fsp/src/bsp/mcu/all/bsp_security.c|1390983687,ra/fsp/inc/instances/r_ioport.h|1615019982,ra/fsp/src/bsp/mcu/all/bsp_sbrk.c|4191472725,ra/fsp/inc/fsp_version.h|496115995,ra/fsp/src/bsp/mcu/all/bsp_register_protection.c|905231975,ra/fsp/src/bsp/mcu/all/bsp_clocks.c|3983299396,ra/fsp/src/bsp/mcu/all/bsp_delay.h|1868795951,ra/fsp/inc/fsp_features.h|3366593968,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h|568600546,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c|3098075304,ra/fsp/src/bsp/mcu/all/bsp_clocks.h|1552630912,ra/fsp/src/bsp/mcu/all/bsp_guard.h|2906400,ra/fsp/src/bsp/mcu/all/bsp_common.c|1957950123,ra/fsp/inc/api/r_ioport_api.h|1630997354,ra/fsp/src/bsp/mcu/all/bsp_irq.c|731782070,ra/fsp/src/bsp/mcu/all/bsp_irq.h|400573940,ra/fsp/src/bsp/mcu/all/bsp_register_protection.h|1222394411,ra/fsp/src/bsp/mcu/all/bsp_io.c|3520119047,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h|2556589544,ra/fsp/src/bsp/mcu/all/bsp_group_irq.c|1992062042,ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h|3590501432,ra/fsp/src/bsp/mcu/all/bsp_io.h|3581546608,ra/fsp/inc/fsp_common_api.h|3984836408,ra/fsp/src/bsp/mcu/all/bsp_group_irq.h|2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h|2006974055,ra/fsp/inc/api/bsp_api.h|3819230577,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c|2812024316,ra/fsp/src/bsp/mcu/all/bsp_common.h|3131094294,ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c
-com.renesas.cdt.ddsc.packs.componentfiles/Arm\#\#CMSIS\#\#CMSIS5\#\#CoreM\#\#\#\#5.7.0+fsp.3.1.0/libraries=
-com.renesas.cdt.ddsc.settingseditor/com.renesas.cdt.ddsc.settingseditor.active_page=SWPConfigurator
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_icu\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_ioport\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#R7FA6M4AF3CFB\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.packs.componentfiles/Arm\#\#CMSIS\#\#CMSIS5\#\#CoreM\#\#\#\#5.7.0+fsp.3.1.0/all=2491522803,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h|637879414,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h|377628369,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h|2686445441,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h|2333906976,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h|546157604,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h|4005730526,ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h|1017116116,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h|1562896660,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h|4231934849,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h|2635219934,ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h|4290386133,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h|3589068132,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h|1078551279,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h|3007265674,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h|1441545198,ra/arm/CMSIS_5/LICENSE.txt|3021372151,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h|3602366610,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h|2748964184,ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h|1372010515,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h|3779323067,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h|1536854638,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h|206980015,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h|3442821435,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h|2327633156,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h|2024281644,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h|2851112248,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h|1745843273,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_sci_uart\#\#\#\#3.1.0/all=2349328507,ra/fsp/src/r_sci_uart/r_sci_uart.c|853178775,ra/fsp/inc/api/r_uart_api.h|1610456547,ra/fsp/inc/api/r_transfer_api.h|1672784957,ra/fsp/inc/instances/r_sci_uart.h
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#fsp\#\#\#\#3.1.0/all=3852442662,ra/fsp/src/bsp/mcu/ra6m4/bsp_feature.h|2347061782,ra/fsp/src/bsp/mcu/ra6m4/bsp_mcu_info.h|3571093944,ra/fsp/src/bsp/mcu/ra6m4/bsp_elc.h
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.1.0/libraries=
-com.renesas.cdt.ddsc.threads.configurator/collapse/module.driver.uart_on_sci_uart.813326093=false
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#Board\#\#ra6m4_cpk\#\#\#\#3.1.0/all=3559227370,ra/board/ra6m4_cpk/board_init.c|3843040667,ra/board/ra6m4_cpk/board_leds.h|2525887392,ra/board/ra6m4_cpk/board_ethernet_phy.h|2967196421,ra/board/ra6m4_cpk/board_init.h|3938710240,ra/board/ra6m4_cpk/board_leds.c|3343992478,ra/board/ra6m4_cpk/board.h
-com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#fsp\#\#\#\#3.1.0/libraries=

bsp/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_pin_cfg.h

@@ -1,116 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef BSP_PIN_CFG_H_
-#define BSP_PIN_CFG_H_
-#include "r_ioport.h"
-#define ARDUINO_AN00 (IOPORT_PORT_00_PIN_00)
-#define ARDUINO_AN01 (IOPORT_PORT_00_PIN_01)
-#define ARDUINO_AN02 (IOPORT_PORT_00_PIN_02)
-#define ARDUINO_AN03 (IOPORT_PORT_00_PIN_03)
-#define ARDUINO_AN04 (IOPORT_PORT_00_PIN_04)
-#define ARDUINO_AN05 (IOPORT_PORT_00_PIN_05)
-#define PMODA_IRQ11 (IOPORT_PORT_00_PIN_06)
-#define J4_PIN23 (IOPORT_PORT_00_PIN_07)
-#define PMODA_IO1 (IOPORT_PORT_00_PIN_08)
-#define J4_PIN26 (IOPORT_PORT_00_PIN_09)
-#define PMODA_IO2 (IOPORT_PORT_00_PIN_14)
-#define PMODA_IO3 (IOPORT_PORT_00_PIN_15)
-#define J1_PIN1 (IOPORT_PORT_01_PIN_00)
-#define J2_PIN4 (IOPORT_PORT_01_PIN_01)
-#define J2_PIN6 (IOPORT_PORT_01_PIN_02)
-#define J1_PIN29 (IOPORT_PORT_01_PIN_03)
-#define J3_PIN39 (IOPORT_PORT_01_PIN_04)
-#define SW1 (IOPORT_PORT_01_PIN_05)
-#define LED3 (IOPORT_PORT_01_PIN_06)
-#define J3_PIN37 (IOPORT_PORT_01_PIN_07)
-#define DEBUG_SWDIO_TMS (IOPORT_PORT_01_PIN_08)
-#define DEBUG_TDO (IOPORT_PORT_01_PIN_09)
-#define DEBUG_TDI (IOPORT_PORT_01_PIN_10)
-#define J1_PIN33 (IOPORT_PORT_01_PIN_11)
-#define J3_PIN15 (IOPORT_PORT_01_PIN_12)
-#define J3_PIN16 (IOPORT_PORT_01_PIN_13)
-#define J3_PIN17 (IOPORT_PORT_01_PIN_14)
-#define J3_PIN18 (IOPORT_PORT_01_PIN_15)
-#define NMI (IOPORT_PORT_02_PIN_00)
-#define MD (IOPORT_PORT_02_PIN_01)
-#define PMODA_MISO_RXD9 (IOPORT_PORT_02_PIN_02)
-#define PMODA_MOSI_TXD9 (IOPORT_PORT_02_PIN_03)
-#define PMODA_RSPCK (IOPORT_PORT_02_PIN_04)
-#define PMODA_SSL_CTS9 (IOPORT_PORT_02_PIN_05)
-#define J1_PIN3 (IOPORT_PORT_02_PIN_06)
-#define J1_PIN8 (IOPORT_PORT_02_PIN_07)
-#define J1_PIN32 (IOPORT_PORT_02_PIN_08)
-#define J1_PIN30 (IOPORT_PORT_02_PIN_09)
-#define J1_PIN28 (IOPORT_PORT_02_PIN_10)
-#define J1_PIN22 (IOPORT_PORT_02_PIN_11)
-#define EXTAL (IOPORT_PORT_02_PIN_12)
-#define XTAL (IOPORT_PORT_02_PIN_13)
-#define J1_PIN20 (IOPORT_PORT_02_PIN_14)
-#define DEBUG_SWDCLK_TCK (IOPORT_PORT_03_PIN_00)
-#define J1_PIN11 (IOPORT_PORT_03_PIN_01)
-#define J3_PIN14 (IOPORT_PORT_03_PIN_02)
-#define J3_PIN13 (IOPORT_PORT_03_PIN_03)
-#define J3_PIN12 (IOPORT_PORT_03_PIN_04)
-#define J3_PIN11 (IOPORT_PORT_03_PIN_05)
-#define J3_PIN10 (IOPORT_PORT_03_PIN_06)
-#define J3_PIN9 (IOPORT_PORT_03_PIN_07)
-#define J3_PIN8 (IOPORT_PORT_03_PIN_08)
-#define J3_PIN7 (IOPORT_PORT_03_PIN_09)
-#define J3_PIN6 (IOPORT_PORT_03_PIN_10)
-#define J3_PIN5 (IOPORT_PORT_03_PIN_11)
-#define J3_PIN4 (IOPORT_PORT_03_PIN_12)
-#define J1_PIN14 (IOPORT_PORT_03_PIN_13)
-#define J4_PIN13 (IOPORT_PORT_04_PIN_00)
-#define J4_PIN11 (IOPORT_PORT_04_PIN_01)
-#define J1_PIN27 (IOPORT_PORT_04_PIN_02)
-#define J4_PIN2 (IOPORT_PORT_04_PIN_03)
-#define J4_PIN4 (IOPORT_PORT_04_PIN_04)
-#define J4_PIN6 (IOPORT_PORT_04_PIN_05)
-#define J4_PIN8 (IOPORT_PORT_04_PIN_06)
-#define USB_VBUS_DETECT (IOPORT_PORT_04_PIN_07)
-#define J2_PIN16 (IOPORT_PORT_04_PIN_08)
-#define J2_PIN18 (IOPORT_PORT_04_PIN_09)
-#define PMODB_MISO_RXD0 (IOPORT_PORT_04_PIN_10)
-#define PMODB_MOSI_TXD0 (IOPORT_PORT_04_PIN_11)
-#define PMODB_RSPCK (IOPORT_PORT_04_PIN_12)
-#define PMODB_SSL_CTS0 (IOPORT_PORT_04_PIN_13)
-#define ARDUINO_RST (IOPORT_PORT_04_PIN_14)
-#define PMODB_IO1 (IOPORT_PORT_04_PIN_15)
-#define USB_VBUS_EN (IOPORT_PORT_05_PIN_00)
-#define USB_OC (IOPORT_PORT_05_PIN_01)
-#define J4_PIN16 (IOPORT_PORT_05_PIN_02)
-#define PMODB_IO2 (IOPORT_PORT_05_PIN_03)
-#define PMODB_IO3 (IOPORT_PORT_05_PIN_04)
-#define DLS_IRQ14 (IOPORT_PORT_05_PIN_05)
-#define PMODB_IRQ15 (IOPORT_PORT_05_PIN_06)
-#define J4_PIN24 (IOPORT_PORT_05_PIN_07)
-#define DLS_SDA (IOPORT_PORT_05_PIN_11)
-#define DLS_SCL (IOPORT_PORT_05_PIN_12)
-#define J1_PIN23 (IOPORT_PORT_06_PIN_00)
-#define J1_PIN19 (IOPORT_PORT_06_PIN_01)
-#define J1_PIN21 (IOPORT_PORT_06_PIN_02)
-#define J1_PIN25 (IOPORT_PORT_06_PIN_03)
-#define J3_PIN36 (IOPORT_PORT_06_PIN_04)
-#define J3_PIN35 (IOPORT_PORT_06_PIN_05)
-#define J3_PIN19 (IOPORT_PORT_06_PIN_08)
-#define J3_PIN20 (IOPORT_PORT_06_PIN_09)
-#define J3_PIN21 (IOPORT_PORT_06_PIN_10)
-#define ARDUINO_GPIO_CLK (IOPORT_PORT_06_PIN_11)
-#define J3_PIN23 (IOPORT_PORT_06_PIN_12)
-#define ARDUINO_TXD (IOPORT_PORT_06_PIN_13)
-#define ARDUINO_RXD (IOPORT_PORT_06_PIN_14)
-#define J4_PIN9 (IOPORT_PORT_07_PIN_00)
-#define J4_PIN7 (IOPORT_PORT_07_PIN_01)
-#define J4_PIN5 (IOPORT_PORT_07_PIN_02)
-#define J4_PIN3 (IOPORT_PORT_07_PIN_03)
-#define J4_PIN1 (IOPORT_PORT_07_PIN_04)
-#define J2_PIN39 (IOPORT_PORT_07_PIN_05)
-#define J2_PIN7 (IOPORT_PORT_07_PIN_08)
-#define J2_PIN11 (IOPORT_PORT_07_PIN_09)
-#define J2_PIN13 (IOPORT_PORT_07_PIN_10)
-#define J2_PIN15 (IOPORT_PORT_07_PIN_11)
-#define ARDUINO_GPIO_PWM (IOPORT_PORT_07_PIN_12)
-#define ARDUINO_GPIO (IOPORT_PORT_07_PIN_13)
-extern const ioport_cfg_t g_bsp_pin_cfg; /* RA6M4 CPK */
-
-void BSP_PinConfigSecurityInit();
-#endif /* BSP_PIN_CFG_H_ */

bsp/renesas/ra6m4-cpk/.settings/standalone.prefs

@@ -0,0 +1,21 @@
+#Thu Jan 13 17:43:26 CST 2022
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.content/com.renesas.cdt.ddsc.content.defaultlinkerscript=script/fsp.scat
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.5.0/all=3983299396,ra/fsp/src/bsp/mcu/all/bsp_delay.h|4222527282,ra/fsp/src/bsp/mcu/all/bsp_module_stop.h|1499520276,ra/fsp/src/bsp/mcu/all/bsp_group_irq.c|3984836408,ra/fsp/src/bsp/mcu/all/bsp_group_irq.h|546480625,ra/fsp/inc/fsp_common_api.h|3297195641,ra/fsp/inc/fsp_version.h|1615019982,ra/fsp/src/bsp/mcu/all/bsp_sbrk.c|3549961311,ra/fsp/src/bsp/mcu/all/bsp_tfu.h|2386285210,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h|521902797,ra/fsp/src/bsp/mcu/all/bsp_security.h|1904866635,ra/fsp/src/bsp/mcu/all/bsp_clocks.h|1728953905,ra/fsp/inc/fsp_features.h|470601830,ra/fsp/src/bsp/mcu/all/bsp_clocks.c|2977689308,ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h|3606266210,ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c|1353647784,ra/fsp/src/bsp/mcu/all/bsp_delay.c|568600546,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c|400573940,ra/fsp/src/bsp/mcu/all/bsp_register_protection.h|3492513568,ra/fsp/src/bsp/mcu/all/bsp_register_protection.c|460577388,ra/fsp/src/bsp/mcu/all/bsp_io.h|1236602439,ra/fsp/src/bsp/mcu/all/bsp_io.c|2847966430,ra/fsp/src/bsp/mcu/all/bsp_security.c|1992062042,ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h|2425160085,ra/fsp/inc/api/bsp_api.h|1939984091,ra/fsp/inc/api/r_ioport_api.h|2920829723,ra/fsp/src/bsp/mcu/all/bsp_guard.c|3753300083,ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h|1552630912,ra/fsp/src/bsp/mcu/all/bsp_guard.h|3998046333,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h|1630997354,ra/fsp/src/bsp/mcu/all/bsp_irq.c|2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h|2906400,ra/fsp/src/bsp/mcu/all/bsp_common.c|731782070,ra/fsp/src/bsp/mcu/all/bsp_irq.h|2208590403,ra/fsp/inc/instances/r_ioport.h|3255765648,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c|4051445857,ra/fsp/src/bsp/mcu/all/bsp_common.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#\#\#3.5.0/all=2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_sci_uart\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.settingseditor/com.renesas.cdt.ddsc.settingseditor.active_page=SWPConfigurator
+com.renesas.cdt.ddsc.threads.configurator/collapse/module.driver.uart_on_sci_uart.201575186=false
+com.renesas.cdt.ddsc.packs.componentfiles/Arm\#\#CMSIS\#\#CMSIS5\#\#CoreM\#\#\#\#5.8.0+renesas.0.fsp.3.5.0/all=1044777225,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armcc.h|1577199483,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h|1372010515,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h|3007265674,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h|2701379970,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h|1494441116,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h|1441545198,ra/arm/CMSIS_5/LICENSE.txt|3898569239,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h|3911746910,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h|2635219934,ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h|3552689244,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h|2333906976,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h|2381390623,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h|3163610011,ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h|2327633156,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h|4290386133,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h|2718020009,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h|1168186370,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h|1564341101,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h|304461792,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h|3358993753,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h|302860276,ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h|1745843273,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h|2851112248,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h|965562395,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h|364344841,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h|3127123217,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h|1017116116,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#fsp\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#Board\#\#ra6m4_cpk\#\#\#\#3.5.0/all=3938710240,ra/board/ra6m4_cpk/board_leds.c|2967196421,ra/board/ra6m4_cpk/board_init.h|3343992478,ra/board/ra6m4_cpk/board.h|3559227370,ra/board/ra6m4_cpk/board_init.c|2525887392,ra/board/ra6m4_cpk/board_ethernet_phy.h|1768800601,ra/board/ra6m4_cpk/board_leds.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_icu\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#fsp\#\#\#\#3.5.0/all=2347061782,ra/fsp/src/bsp/mcu/ra6m4/bsp_mcu_info.h|3301568719,ra/fsp/src/bsp/mcu/ra6m4/bsp_feature.h|1009023542,ra/fsp/src/bsp/mcu/ra6m4/bsp_elc.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_ioport\#\#\#\#3.5.0/all=1939984091,ra/fsp/inc/api/r_ioport_api.h|3254285722,ra/fsp/src/r_ioport/r_ioport.c|2208590403,ra/fsp/inc/instances/r_ioport.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_icu\#\#\#\#3.5.0/all=1906465970,ra/fsp/inc/api/r_external_irq_api.h|2545672180,ra/fsp/inc/instances/r_icu.h|3018483678,ra/fsp/src/r_icu/r_icu.c
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_sci_uart\#\#\#\#3.5.0/all=3094200246,ra/fsp/src/r_sci_uart/r_sci_uart.c|1610456547,ra/fsp/inc/api/r_transfer_api.h|3916852077,ra/fsp/inc/api/r_uart_api.h|1889256766,ra/fsp/inc/instances/r_sci_uart.h
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#Board\#\#ra6m4_cpk\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Arm\#\#CMSIS\#\#CMSIS5\#\#CoreM\#\#\#\#5.8.0+renesas.0.fsp.3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#HAL\ Drivers\#\#all\#\#r_ioport\#\#\#\#3.5.0/libraries=
+com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m4\#\#device\#\#R7FA6M4AF3CFB\#\#3.5.0/libraries=

bsp/ra6m4-cpk/Kconfig → bsp/renesas/ra6m4-cpk/Kconfig

@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../.."
+    default "../../.."
     
 # you can change the RTT_ROOT default "../.." to your rtthread_root,
 # example : default "F:/git_repositories/rt-thread"

bsp/ra6m4-cpk/README.md → bsp/renesas/ra6m4-cpk/README.md

@@ -44,8 +44,10 @@
 | CAN                | 支持               |                |
 | 持续更新中...      |                    |                |
 | **外接外设** | **支持情况** | **备注** |
-| WiFi        | 支持        |  [RW007 WiFi 网络模块](https://github.com/RT-Thread-packages/rw007)  |
+| WiFi 模块     | 支持        |  [RW007 WiFi 网络模块](https://github.com/RT-Thread-packages/rw007)  |
 | 温湿度传感器   | 支持       |  [HS300x 温湿度模块](https://github.com/Guozhanxin/hs300x) |
+| 室内空气质量传感器 | 支持 | [zmod4410 室内空气质量模块](https://github.com/ShermanShao/zmod4410) |
+| 光线传感器 | 支持 | [isl29035光线传感器模块](https://github.com/ShermanShao/isl29035) |
 
 
 ## 使用说明
@@ -65,7 +67,7 @@
 
 **硬件连接**
 
-使用 USB 数据线连接开发板到 PC。使用 USB 转串口工具连接 P613(TXD)、P614(RXD)。
+使用 USB 数据线连接开发板到 PC，使用 J-link 接口下载和 DEBUG 程序。使用 USB 转串口工具连接 UART7：P613(TXD)、P614(RXD)。
 
 **编译下载**
 
@@ -153,16 +155,17 @@ void hal_entry(void)
 
 需要修改瑞萨的 BSP 外设配置或添加新的外设端口，需要用到瑞萨的 [FSP](https://www2.renesas.cn/jp/zh/software-tool/flexible-software-package-fsp#document) 配置工具。请务必按照如下步骤完成配置。配置中有任何问题可到[RT-Thread 社区论坛](https://club.rt-thread.org/)中提问。
 
-1. [下载灵活配置软件包 (FSP) | Renesas](https://www.renesas.com/cn/zh/software-tool/flexible-software-package-fsp)，建议使用 FSP 3.1.0
-2. 下载安装完成后，需要添加 CPK-RA6M4 开发板的[官方板级支持包](https://www2.renesas.cn/document/sws/1527176?language=zh&r=1527191)
-3. 如何将 BSP 配置包添加到 FSP 中，请参考文档[如何导入板级支持包](https://www2.renesas.cn/document/ppt/1527171?language=zh&r=1527191)
+1. [下载灵活配置软件包 (FSP) | Renesas](https://www.renesas.com/cn/zh/software-tool/flexible-software-package-fsp)，请使用 FSP 3.5.0 版本
+2. 下载安装完成后，需要添加 CPK-RA6M4 开发板的官方板级支持包
+> 打开[ CPK-RA6M4 开发板详情页](https://www2.renesas.cn/jp/zh/products/microcontrollers-microprocessors/ra-cortex-m-mcus/cpk-ra6m4-evaluation-board)，在**“下载”**列表中找到 **”CPK-RA6M4板级支持包“**，点击链接即可下载
+3. 如何将 **”CPK-RA6M4板级支持包“**添加到 FSP 中，请参考文档[如何导入板级支持包](https://www2.renesas.cn/document/ppt/1527171?language=zh&r=1527191)
 4. 请查看文档：[使用瑞萨 FSP 配置工具](./docs/使用瑞萨FSP配置工具.md)。在 MDK 中通过添加自定义命名来打开当前工程的 FSP 配置。
 
 **ENV 配置**
 
 - 如何使用 ENV 工具：[RT-Thread env 工具用户手册](https://www.rt-thread.org/document/site/#/development-tools/env/env)
 
-此 BSP 默认只开启了 串口7 的功能，如果需使用更多高级功能例如组件、软件包等，需要利用 ENV 工具进行配置。
+此 BSP 默认只开启了 UART7 的功能，如果需使用更多高级功能例如组件、软件包等，需要利用 ENV 工具进行配置。
 
 步骤如下：
 1. 在 bsp 下打开 env 工具。

bsp/renesas/ra6m4-cpk/RTE/_Target_1/RTE_Components.h

@@ -0,0 +1,15 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'project'
+ * Target:  'Target 1'
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+
+#endif /* RTE_COMPONENTS_H */

bsp/ra6m4-cpk/SConstruct → bsp/renesas/ra6m4-cpk/SConstruct

@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.normpath(os.getcwd() + '/../..')
+    RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 try:

bsp/ra6m4-cpk/buildinfo.gpdsc → bsp/renesas/ra6m4-cpk/buildinfo.gpdsc

@@ -74,6 +74,7 @@
         <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"/>
@@ -108,11 +109,11 @@
         <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/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_icu/r_icu.c"/>
-        <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="source" name="ra/fsp/src/r_sci_uart/r_sci_uart.c"/>

bsp/ra6m4-cpk/configuration.xml → bsp/renesas/ra6m4-cpk/configuration.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<raConfiguration version="6">
+<raConfiguration version="7">
   <generalSettings>
     <option key="#Board#" value="board.ra6m4cpk"/>
     <option key="CPU" value="RA6M4"/>
@@ -8,7 +8,7 @@
     <option key="#DeviceCommand#" value="R7FA6M4AF"/>
     <option key="#RTOS#" value="_none"/>
     <option key="#pinconfiguration#" value="R7FA6M4AF3CFB.pincfg"/>
-    <option key="#FSPVersion#" value="3.1.0"/>
+    <option key="#FSPVersion#" value="3.5.0"/>
     <option key="#ConfigurationFragments#" value="Renesas##BSP##Board##ra6m4_cpk##"/>
     <option key="#SELECTED_TOOLCHAIN#" value="com.arm.toolchain"/>
   </generalSettings>
@@ -71,6 +71,8 @@
       <property id="config.bsp.fsp.mcu.sci_spi.max_bitrate" value="25000000"/>
       <property id="config.bsp.fsp.mcu.spi.max_bitrate" value="50000000"/>
       <property id="config.bsp.fsp.mcu.iic_master.rate.rate_fastplus" value="1"/>
+      <property id="config.bsp.fsp.mcu.sci_uart.cstpen_channels" value="0x03F9"/>
+      <property id="config.bsp.fsp.mcu.gpt.pin_count_source_channels" value="0xFFFF"/>
     </config>
     <config id="config.bsp.ra">
       <property id="config.bsp.common.main" value="0x400"/>
@@ -83,6 +85,7 @@
       <property id="config.bsp.common.main_osc_populated" value="config.bsp.common.main_osc_populated.enabled"/>
       <property id="config.bsp.common.pfs_protect" value="config.bsp.common.pfs_protect.enabled"/>
       <property id="config.bsp.common.c_runtime_init" value="config.bsp.common.c_runtime_init.enabled"/>
+      <property id="config.bsp.common.early_init" value="config.bsp.common.early_init.disabled"/>
       <property id="config.bsp.common.main_osc_clock_source" value="config.bsp.common.main_osc_clock_source.crystal"/>
       <property id="config.bsp.common.subclock_populated" value="config.bsp.common.subclock_populated.enabled"/>
       <property id="config.bsp.common.subclock_drive" value="config.bsp.common.subclock_drive.standard"/>
@@ -131,41 +134,41 @@
     <node id="board.clock.octaspiclk.display" option="board.clock.octaspiclk.display.value"/>
   </raClockConfiguration>
   <raComponentSelection>
-    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="Common" condition="" group="all" subgroup="fsp_common" variant="" vendor="Renesas" version="3.5.0">
       <description>Board Support Package Common Files</description>
-      <originalPack>Renesas.RA.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ioport" variant="" vendor="Renesas" version="3.5.0">
       <description>I/O Port</description>
-      <originalPack>Renesas.RA.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.7.0+fsp.3.1.0">
+    <component apiversion="" class="CMSIS" condition="" group="CMSIS5" subgroup="CoreM" variant="" vendor="Arm" version="5.8.0+renesas.0.fsp.3.5.0">
       <description>Arm CMSIS Version 5 - Core (M)</description>
-      <originalPack>Arm.CMSIS5.5.7.0+fsp.3.1.0.pack</originalPack>
+      <originalPack>Arm.CMSIS5.5.8.0+renesas.0.fsp.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra6m4_cpk" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="BSP" condition="" group="Board" subgroup="ra6m4_cpk" variant="" vendor="Renesas" version="3.5.0">
       <description>RA6M4-CPK Board Support Files</description>
-      <originalPack>Renesas.RA_board_ra6m4_cpk.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA_board_ra6m4_cpk.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="device" variant="R7FA6M4AF3CFB" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="device" variant="R7FA6M4AF3CFB" vendor="Renesas" version="3.5.0">
       <description>Board support package for R7FA6M4AF3CFB</description>
-      <originalPack>Renesas.RA_mcu_ra6m4.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA_mcu_ra6m4.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="device" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="device" variant="" vendor="Renesas" version="3.5.0">
       <description>Board support package for RA6M4</description>
-      <originalPack>Renesas.RA_mcu_ra6m4.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA_mcu_ra6m4.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="fsp" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="BSP" condition="" group="ra6m4" subgroup="fsp" variant="" vendor="Renesas" version="3.5.0">
       <description>Board support package for RA6M4 - FSP Data</description>
-      <originalPack>Renesas.RA_mcu_ra6m4.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA_mcu_ra6m4.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_uart" variant="" vendor="Renesas" version="3.5.0">
       <description>SCI UART</description>
-      <originalPack>Renesas.RA.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="3.1.0">
+    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_icu" variant="" vendor="Renesas" version="3.5.0">
       <description>External Interrupt</description>
-      <originalPack>Renesas.RA.3.1.0.pack</originalPack>
+      <originalPack>Renesas.RA.3.5.0.pack</originalPack>
     </component>
   </raComponentSelection>
   <raElcConfiguration/>
@@ -177,8 +180,13 @@
       <property id="module.driver.ioport.elc_trigger_ioport2" value="_disabled"/>
       <property id="module.driver.ioport.elc_trigger_ioport3" value="_disabled"/>
       <property id="module.driver.ioport.elc_trigger_ioport4" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioportb" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioportc" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioportd" value="_disabled"/>
+      <property id="module.driver.ioport.elc_trigger_ioporte" value="_disabled"/>
+      <property id="module.driver.ioport.pincfg" value="g_bsp_pin_cfg"/>
     </module>
-    <module id="module.driver.uart_on_sci_uart.813326093">
+    <module id="module.driver.uart_on_sci_uart.201575186">
       <property id="module.driver.uart.name" value="g_uart7"/>
       <property id="module.driver.uart.channel" value="7"/>
       <property id="module.driver.uart.data_bits" value="module.driver.uart.data_bits.data_bits_8"/>
@@ -200,7 +208,7 @@
       <property id="module.driver.uart.tei_ipl" value="board.icu.common.irq.priority12"/>
       <property id="module.driver.uart.eri_ipl" value="board.icu.common.irq.priority12"/>
     </module>
-    <module id="module.driver.external_irq_on_icu.402865750">
+    <module id="module.driver.external_irq_on_icu.1658263033">
       <property id="module.driver.external_irq.name" value="g_external_irq0"/>
       <property id="module.driver.external_irq.channel" value="0"/>
       <property id="module.driver.external_irq.trigger" value="module.driver.external_irq.trigger.trig_rising"/>
@@ -211,8 +219,8 @@
     </module>
     <context id="_hal.0">
       <stack module="module.driver.ioport_on_ioport.0"/>
-      <stack module="module.driver.uart_on_sci_uart.813326093"/>
-      <stack module="module.driver.external_irq_on_icu.402865750"/>
+      <stack module="module.driver.uart_on_sci_uart.201575186"/>
+      <stack module="module.driver.external_irq_on_icu.1658263033"/>
     </context>
     <config id="config.driver.ioport">
       <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
@@ -337,19 +345,16 @@
     <symbolicName propertyId="p712.symbolic_name" value="ARDUINO_GPIO_PWM"/>
     <symbolicName propertyId="p713.symbolic_name" value="ARDUINO_GPIO"/>
     <pincfg active="true" name="RA6M4 CPK" selected="true" symbol="g_bsp_pin_cfg">
+      <configSetting altId="adc0.an00.p000" configurationId="adc0.an00"/>
+      <configSetting altId="adc0.an01.p001" configurationId="adc0.an01"/>
+      <configSetting altId="adc0.an02.p002" configurationId="adc0.an02"/>
       <configSetting altId="adc0.an03.p003" configurationId="adc0.an03"/>
       <configSetting altId="adc0.an04.p004" configurationId="adc0.an04"/>
       <configSetting altId="adc0.an05.p005" configurationId="adc0.an05"/>
       <configSetting altId="adc0.mode.custom" configurationId="adc0.mode"/>
-      <configSetting altId="adc1.an00.p000" configurationId="adc1.an00"/>
-      <configSetting altId="adc1.an01.p001" configurationId="adc1.an01"/>
-      <configSetting altId="adc1.an02.p002" configurationId="adc1.an02"/>
-      <configSetting altId="adc1.mode.custom" configurationId="adc1.mode"/>
       <configSetting altId="cgc0.extal.p212" configurationId="cgc0.extal"/>
       <configSetting altId="cgc0.mode.mainsub" configurationId="cgc0.mode"/>
       <configSetting altId="cgc0.xtal.p213" configurationId="cgc0.xtal"/>
-      <configSetting altId="dac0.da.p014" configurationId="dac0.da"/>
-      <configSetting altId="dac0.mode.enabled" configurationId="dac0.mode"/>
       <configSetting altId="debug0.mode.jtag" configurationId="debug0.mode"/>
       <configSetting altId="debug0.tck.p300" configurationId="debug0.tck"/>
       <configSetting altId="debug0.tdi.p110" configurationId="debug0.tdi"/>
@@ -363,17 +368,17 @@
       <configSetting altId="irq0.irq14.p505" configurationId="irq0.irq14"/>
       <configSetting altId="irq0.irq15.p506" configurationId="irq0.irq15"/>
       <configSetting altId="irq0.mode.enabled" configurationId="irq0.mode"/>
-      <configSetting altId="p000.asel" configurationId="p000"/>
+      <configSetting altId="p000.adc0.an00" configurationId="p000"/>
       <configSetting altId="p000.gpio_mode.gpio_mode_an" configurationId="p000.gpio_mode"/>
-      <configSetting altId="p001.asel" configurationId="p001"/>
+      <configSetting altId="p001.adc0.an01" configurationId="p001"/>
       <configSetting altId="p001.gpio_mode.gpio_mode_an" configurationId="p001.gpio_mode"/>
-      <configSetting altId="p002.asel" configurationId="p002"/>
+      <configSetting altId="p002.adc0.an02" configurationId="p002"/>
       <configSetting altId="p002.gpio_mode.gpio_mode_an" configurationId="p002.gpio_mode"/>
-      <configSetting altId="p003.asel" configurationId="p003"/>
+      <configSetting altId="p003.adc0.an03" configurationId="p003"/>
       <configSetting altId="p003.gpio_mode.gpio_mode_an" configurationId="p003.gpio_mode"/>
-      <configSetting altId="p004.asel" configurationId="p004"/>
+      <configSetting altId="p004.adc0.an04" configurationId="p004"/>
       <configSetting altId="p004.gpio_mode.gpio_mode_an" configurationId="p004.gpio_mode"/>
-      <configSetting altId="p005.asel" configurationId="p005"/>
+      <configSetting altId="p005.adc0.an05" configurationId="p005"/>
       <configSetting altId="p005.gpio_mode.gpio_mode_an" configurationId="p005.gpio_mode"/>
       <configSetting altId="p006.irq0.irq11" configurationId="p006"/>
       <configSetting altId="p006.gpio_irq.gpio_irq_enabled" configurationId="p006.gpio_irq"/>
@@ -381,8 +386,8 @@
       <configSetting altId="p006.gpio_pupd.gpio_pupd_ip_up" configurationId="p006.gpio_pupd"/>
       <configSetting altId="p008.output.low" configurationId="p008"/>
       <configSetting altId="p008.gpio_mode.gpio_mode_out.low" configurationId="p008.gpio_mode"/>
-      <configSetting altId="p014.asel" configurationId="p014"/>
-      <configSetting altId="p014.gpio_mode.gpio_mode_an" configurationId="p014.gpio_mode"/>
+      <configSetting altId="p014.output.low" configurationId="p014"/>
+      <configSetting altId="p014.gpio_mode.gpio_mode_out.low" configurationId="p014.gpio_mode"/>
       <configSetting altId="p015.output.low" configurationId="p015"/>
       <configSetting altId="p015.gpio_mode.gpio_mode_out.low" configurationId="p015.gpio_mode"/>
       <configSetting altId="p105.irq0.irq00" configurationId="p105"/>

bsp/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md → bsp/renesas/ra6m4-cpk/docs/使用瑞萨FSP配置工具.md

@@ -4,14 +4,14 @@
 
 1. 打开 MDK，选择 “Tools -> Customize Tools Menu…”
 2. 点击 “new” 图标，添加一条自定义命令: RA Smart Configurator
-3. Command 输入工具的安装路径， 点击“…”找到安装路径下的“rasc.exe”文件并选中 (setup_fsp_v3_1_0_rasc_ 安装目录下)
+3. Command 输入工具的安装路径， 点击“**…**”找到安装路径下的“rasc.exe”文件并选中 (rasc 安装目录下)
 4. Initial Folder 输入参数: $P
 5. Arguments 输入参数: --device $D --compiler ARMv6 configuration.xml
-6. 点击 OK 保存命令“Tools -> RA smart Configurator”
+6. 点击 OK 保存命令
 
 ![img](picture/customize.png)
 
-7. 点击添加的命令打开配置工具：RA Smart Config
+7. 点击添加的命令 “Tools -> RA smart Configurator”，**打开配置工具**：RA Smart Config
 
 ![image.png](picture/openrasc.png)
 
@@ -24,13 +24,13 @@
 
 > PS：以上相关操作也可以在 FSP 的说明文档中找到。
 >
-> 文档路径（本地）：在 FSP 的安装目录下  .\fsp_documentation\v3.1.0\fsp_user_manual_v3.1.0\index.html
+> 文档路径（本地）：在 FSP 的安装目录下  .\fsp_documentation\v3.5.0\fsp_user_manual_v3.5.0\index.html
 >
 > 文档路径（官网）：https://www2.renesas.cn/jp/zh/software-tool/flexible-software-package-fsp#document
 
 ###  FSP 版本选择
 
-此 BSP 使用 **FSP 3.1.0** 版本为基础制作，优先推荐使用 FSP 3.1.0 版本进行配置修改。
+此 BSP 已更新 **FSP 3.5.0** 版本的支持，请使用 **FSP 3.5.0** 版本进行配置修改。下文中部分操作截图使用的是 FSP 3.1.0 版本，仅供参考。
 
 **使用 RASC 前请务必检查 FSP version 、Board、Device 配置项是否正确。**
 

bsp/ra6m4-cpk/drivers/drv_common.c → bsp/renesas/ra6m4-cpk/drivers/drv_common.c

@@ -140,3 +140,46 @@ RT_WEAK void rt_hw_board_init()
 #endif
 }
 
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart (bsp_warm_start_event_t event)
+{
+    if (BSP_WARM_START_RESET == event)
+    {
+#if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+#endif
+    }
+
+    if (BSP_WARM_START_POST_C == event)
+    {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, g_ioport.p_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable ();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable ()
+{
+
+}
+#endif