diff --git a/bsp/renesas/ra6m3-ek/.config b/bsp/renesas/ra6m3-ek/.config index 3c9fcdc205..89d9ffe693 100644 --- a/bsp/renesas/ra6m3-ek/.config +++ b/bsp/renesas/ra6m3-ek/.config @@ -208,6 +208,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set # CONFIG_RT_USING_VAR_EXPORT is not set +# CONFIG_RT_USING_ADT is not set # CONFIG_RT_USING_RT_LINK is not set # CONFIG_RT_USING_VBUS is not set diff --git a/bsp/renesas/ra6m3-ek/.settings/standalone.prefs b/bsp/renesas/ra6m3-ek/.settings/standalone.prefs index 3ea670688a..e885db60ec 100644 --- a/bsp/renesas/ra6m3-ek/.settings/standalone.prefs +++ b/bsp/renesas/ra6m3-ek/.settings/standalone.prefs @@ -1,11 +1,11 @@ -#Tue Jan 31 18:32:07 CST 2023 +#Mon Feb 06 15:24:06 CST 2023 com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.5.0/libraries= com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m3\#\#fsp\#\#\#\#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\#\#BSP\#\#ra6m3\#\#fsp\#\#\#\#3.5.0/all=143358381,ra/fsp/src/bsp/mcu/ra6m3/bsp_elc.h|2743353138,ra/fsp/src/bsp/mcu/ra6m3/bsp_feature.h|3427620923,ra/fsp/src/bsp/mcu/ra6m3/bsp_mcu_info.h com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#Common\#\#all\#\#fsp_common\#\#\#\#3.5.0/all=568600546,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c|2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h|3753300083,ra/fsp/src/bsp/mcu/all/bsp_arm_exceptions.h|2425160085,ra/fsp/inc/api/bsp_api.h|1499520276,ra/fsp/src/bsp/mcu/all/bsp_group_irq.c|2847966430,ra/fsp/src/bsp/mcu/all/bsp_security.c|3984836408,ra/fsp/src/bsp/mcu/all/bsp_group_irq.h|3998046333,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/base_addresses.h|521902797,ra/fsp/src/bsp/mcu/all/bsp_security.h|1939984091,ra/fsp/inc/api/r_ioport_api.h|2906400,ra/fsp/src/bsp/mcu/all/bsp_common.c|2386285210,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h|4051445857,ra/fsp/src/bsp/mcu/all/bsp_common.h|1236602439,ra/fsp/src/bsp/mcu/all/bsp_io.c|1904866635,ra/fsp/src/bsp/mcu/all/bsp_clocks.h|3983299396,ra/fsp/src/bsp/mcu/all/bsp_delay.h|3492513568,ra/fsp/src/bsp/mcu/all/bsp_register_protection.c|1728953905,ra/fsp/inc/fsp_features.h|1630997354,ra/fsp/src/bsp/mcu/all/bsp_irq.c|4222527282,ra/fsp/src/bsp/mcu/all/bsp_module_stop.h|1615019982,ra/fsp/src/bsp/mcu/all/bsp_sbrk.c|546480625,ra/fsp/inc/fsp_common_api.h|400573940,ra/fsp/src/bsp/mcu/all/bsp_register_protection.h|2977689308,ra/fsp/src/bsp/mcu/all/bsp_mcu_api.h|3255765648,ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c|3549961311,ra/fsp/src/bsp/mcu/all/bsp_tfu.h|1353647784,ra/fsp/src/bsp/mcu/all/bsp_delay.c|2208590403,ra/fsp/inc/instances/r_ioport.h|1992062042,ra/fsp/src/bsp/mcu/all/bsp_compiler_support.h|3606266210,ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c|3297195641,ra/fsp/inc/fsp_version.h|1552630912,ra/fsp/src/bsp/mcu/all/bsp_guard.h|470601830,ra/fsp/src/bsp/mcu/all/bsp_clocks.c|2920829723,ra/fsp/src/bsp/mcu/all/bsp_guard.c|731782070,ra/fsp/src/bsp/mcu/all/bsp_irq.h|460577388,ra/fsp/src/bsp/mcu/all/bsp_io.h 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.settingseditor/com.renesas.cdt.ddsc.settingseditor.active_page=PinConfiguration 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|4290386133,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0plus.h|2635219934,ra/arm/CMSIS_5/CMSIS/Core/Include/tz_context.h|302860276,ra/arm/CMSIS_5/CMSIS/Core/Include/cachel1_armv7.h|3007265674,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mbl.h|2333906976,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_version.h|3898569239,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang.h|3127123217,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm35p.h|2381390623,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv8mml.h|1372010515,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm23.h|3163610011,ra/arm/CMSIS_5/CMSIS/Core/Include/pmu_armv8.h|364344841,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc300.h|1494441116,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv7.h|2701379970,ra/arm/CMSIS_5/CMSIS/Core/Include/mpu_armv8.h|965562395,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_gcc.h|304461792,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm3.h|3358993753,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm4.h|1441545198,ra/arm/CMSIS_5/LICENSE.txt|2851112248,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm1.h|1017116116,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_compiler.h|1745843273,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm0.h|3552689244,ra/arm/CMSIS_5/CMSIS/Core/Include/core_armv81mml.h|1564341101,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm7.h|1168186370,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm55.h|2718020009,ra/arm/CMSIS_5/CMSIS/Core/Include/core_cm33.h|2327633156,ra/arm/CMSIS_5/CMSIS/Core/Include/core_sc000.h|3911746910,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_armclang_ltm.h|1577199483,ra/arm/CMSIS_5/CMSIS/Core/Include/cmsis_iccarm.h com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#ra6m3\#\#device\#\#\#\#3.5.0/all=2308894280,ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/system.h com.renesas.cdt.ddsc.packs.componentfiles/Renesas\#\#BSP\#\#Board\#\#custom\#\#\#\#3.5.0/all= diff --git a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc b/bsp/renesas/ra6m3-ek/buildinfo.gpdsc index f242475011..1e4223b52e 100644 --- a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc +++ b/bsp/renesas/ra6m3-ek/buildinfo.gpdsc @@ -58,11 +58,13 @@ + + @@ -111,7 +113,6 @@ - diff --git a/bsp/renesas/ra6m3-ek/configuration.xml b/bsp/renesas/ra6m3-ek/configuration.xml index 09fb671b8e..901b4a80d1 100644 --- a/bsp/renesas/ra6m3-ek/configuration.xml +++ b/bsp/renesas/ra6m3-ek/configuration.xml @@ -224,18 +224,7 @@ - - - - - - - - - - - @@ -244,43 +233,13 @@ - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/bsp/renesas/ra6m3-ek/project.uvoptx b/bsp/renesas/ra6m3-ek/project.uvoptx index 7fbe1c3f8c..19dad1c7c2 100644 --- a/bsp/renesas/ra6m3-ek/project.uvoptx +++ b/bsp/renesas/ra6m3-ek/project.uvoptx @@ -117,6 +117,26 @@ Segger\JL2CM3.dll + + 0 + ARMRTXEVENTFLAGS + -L70 -Z18 -C0 -M0 -T1 + + + 0 + DLGTARM + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0) + + + 0 + ARMDBGFLAGS + + + + 0 + DLGUARM + d + 0 UL2CM3 @@ -125,7 +145,7 @@ 0 JL2CM3 - -U831004110 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD0 -FC800 -FN0 + -U831004110 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD0 -FC800 -FN0 @@ -135,12 +155,12 @@ 0 1 - 0 + 1 0 0 0 0 - 0 + 1 0 0 0 @@ -175,7 +195,7 @@ - ADT + Compiler 0 0 0 @@ -187,34 +207,14 @@ 0 0 0 - ..\..\..\components\utilities\libadt\avl.c - avl.c - 0 - 0 - - - - - Compiler - 0 - 0 - 0 - 0 - - 2 - 2 - 1 - 0 - 0 - 0 ..\..\..\components\libc\compilers\armlibc\syscall_mem.c syscall_mem.c 0 0 - 2 - 3 + 1 + 2 1 0 0 @@ -225,8 +225,8 @@ 0 - 2 - 4 + 1 + 3 1 0 0 @@ -237,8 +237,8 @@ 0 - 2 - 5 + 1 + 4 1 0 0 @@ -249,8 +249,8 @@ 0 - 2 - 6 + 1 + 5 1 0 0 @@ -261,8 +261,8 @@ 0 - 2 - 7 + 1 + 6 1 0 0 @@ -273,8 +273,8 @@ 0 - 2 - 8 + 1 + 7 1 0 0 @@ -285,8 +285,8 @@ 0 - 2 - 9 + 1 + 8 1 0 0 @@ -305,8 +305,8 @@ 0 0 - 3 - 10 + 2 + 9 1 0 0 @@ -317,8 +317,8 @@ 0 - 3 - 11 + 2 + 10 1 0 0 @@ -329,8 +329,8 @@ 0 - 3 - 12 + 2 + 11 1 0 0 @@ -341,8 +341,8 @@ 0 - 3 - 13 + 2 + 12 2 0 0 @@ -353,8 +353,8 @@ 0 - 3 - 14 + 2 + 13 1 0 0 @@ -373,8 +373,8 @@ 0 0 - 4 - 15 + 3 + 14 1 0 0 @@ -385,8 +385,8 @@ 0 - 4 - 16 + 3 + 15 1 0 0 @@ -397,8 +397,8 @@ 0 - 4 - 17 + 3 + 16 1 0 0 @@ -409,8 +409,8 @@ 0 - 4 - 18 + 3 + 17 1 0 0 @@ -421,8 +421,8 @@ 0 - 4 - 19 + 3 + 18 1 0 0 @@ -433,8 +433,8 @@ 0 - 4 - 20 + 3 + 19 1 0 0 @@ -445,8 +445,8 @@ 0 - 4 - 21 + 3 + 20 1 0 0 @@ -457,8 +457,8 @@ 0 - 4 - 22 + 3 + 21 1 0 0 @@ -469,8 +469,8 @@ 0 - 4 - 23 + 3 + 22 1 0 0 @@ -489,8 +489,8 @@ 0 0 - 5 - 24 + 4 + 23 1 0 0 @@ -501,8 +501,8 @@ 0 - 5 - 25 + 4 + 24 1 0 0 @@ -513,8 +513,8 @@ 0 - 5 - 26 + 4 + 25 1 0 0 @@ -533,8 +533,8 @@ 0 0 - 6 - 27 + 5 + 26 1 0 0 @@ -545,8 +545,8 @@ 0 - 6 - 28 + 5 + 27 1 0 0 @@ -557,8 +557,8 @@ 0 - 6 - 29 + 5 + 28 1 0 0 @@ -569,8 +569,8 @@ 0 - 6 - 30 + 5 + 29 1 0 0 @@ -589,8 +589,8 @@ 0 0 - 7 - 31 + 6 + 30 1 0 0 @@ -601,8 +601,8 @@ 0 - 7 - 32 + 6 + 31 1 0 0 @@ -613,8 +613,8 @@ 0 - 7 - 33 + 6 + 32 1 0 0 @@ -625,8 +625,8 @@ 0 - 7 - 34 + 6 + 33 1 0 0 @@ -637,8 +637,8 @@ 0 - 7 - 35 + 6 + 34 1 0 0 @@ -649,8 +649,8 @@ 0 - 7 - 36 + 6 + 35 1 0 0 @@ -661,8 +661,8 @@ 0 - 7 - 37 + 6 + 36 1 0 0 @@ -673,8 +673,8 @@ 0 - 7 - 38 + 6 + 37 1 0 0 @@ -685,8 +685,8 @@ 0 - 7 - 39 + 6 + 38 1 0 0 @@ -697,8 +697,8 @@ 0 - 7 - 40 + 6 + 39 1 0 0 @@ -709,8 +709,8 @@ 0 - 7 - 41 + 6 + 40 1 0 0 @@ -721,8 +721,8 @@ 0 - 7 - 42 + 6 + 41 1 0 0 @@ -741,8 +741,8 @@ 0 0 - 8 - 43 + 7 + 42 1 0 0 diff --git a/bsp/renesas/ra6m3-ek/project.uvprojx b/bsp/renesas/ra6m3-ek/project.uvprojx index c2e10abef5..ca2d8fdf37 100644 --- a/bsp/renesas/ra6m3-ek/project.uvprojx +++ b/bsp/renesas/ra6m3-ek/project.uvprojx @@ -129,7 +129,7 @@ - 1 + 0 1 0 1 @@ -138,7 +138,7 @@ 1 BIN\UL2CM3.DLL - + "" () @@ -339,7 +339,7 @@ -Wno-license-management -Wunused -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal RT_USING_LIBC, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - ..\..\..\include;board;.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\stdio;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension;..\..\..\components\utilities\libadt;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers;board\ports;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\libraries\HAL_Drivers\config;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\include;..\..\..\components\drivers\include + ..\..\..\include;board;.;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\stdio;..\..\..\components\finsh;..\libraries\HAL_Drivers\config;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers;board\ports;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\include @@ -380,16 +380,6 @@ - - ADT - - - avl.c - 1 - ..\..\..\components\utilities\libadt\avl.c - - - Compiler diff --git a/bsp/renesas/ra6m3-ek/ra_gen/pin_data.c b/bsp/renesas/ra6m3-ek/ra_gen/pin_data.c index 2233b756ff..9986dea419 100644 --- a/bsp/renesas/ra6m3-ek/ra_gen/pin_data.c +++ b/bsp/renesas/ra6m3-ek/ra_gen/pin_data.c @@ -22,52 +22,12 @@ const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = { }, { .pin = BSP_IO_PORT_04_PIN_01, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) + .pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_SCI1_3_5_7_9) }, { .pin = BSP_IO_PORT_04_PIN_02, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_04_PIN_05, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_04_PIN_06, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_06_PIN_13, .pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_SCI1_3_5_7_9) }, - { - .pin = BSP_IO_PORT_06_PIN_14, - .pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_SCI1_3_5_7_9) - }, - { - .pin = BSP_IO_PORT_07_PIN_00, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_07_PIN_01, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_07_PIN_02, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_07_PIN_03, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_07_PIN_04, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, - { - .pin = BSP_IO_PORT_07_PIN_05, - .pin_cfg = ((uint32_t) IOPORT_CFG_DRIVE_HIGH | (uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_ETHER_RMII) - }, }; const ioport_cfg_t g_bsp_pin_cfg = { diff --git a/bsp/renesas/ra6m3-ek/template.uvoptx b/bsp/renesas/ra6m3-ek/template.uvoptx index b61c2ff6f9..501cc00148 100644 --- a/bsp/renesas/ra6m3-ek/template.uvoptx +++ b/bsp/renesas/ra6m3-ek/template.uvoptx @@ -125,7 +125,7 @@ 0 JL2CM3 - -U831004110 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD0 -FC800 -FN0 + -U831004110 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(5BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD0 -FC800 -FN0 diff --git a/bsp/renesas/ra6m3-ek/template.uvprojx b/bsp/renesas/ra6m3-ek/template.uvprojx index 0d591581d1..a3f2db8b84 100644 --- a/bsp/renesas/ra6m3-ek/template.uvprojx +++ b/bsp/renesas/ra6m3-ek/template.uvprojx @@ -128,7 +128,7 @@ - 1 + 0 1 0 1 @@ -137,7 +137,7 @@ 1 BIN\UL2CM3.DLL - + "" () @@ -410,7 +410,7 @@ - +