Skip to content

Commit 58b165c

Browse files
committed
update bsp ra6e2-ek
1 parent 1d9bd7e commit 58b165c

File tree

5 files changed

+55
-49
lines changed

5 files changed

+55
-49
lines changed

bsp/renesas/ra6e2-ek/Kconfig

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,18 @@ PKGS_DIR := packages
1111

1212
ENV_DIR := /
1313

14+
config SOC_R7FA6E2BB
15+
bool
16+
select SOC_SERIES_R7FA6E2
17+
select ARCH_ARM_CORTEX_SECURE
18+
select RT_USING_COMPONENTS_INIT
19+
select RT_USING_USER_MAIN
20+
default y
21+
1422
source "$(RTT_DIR)/Kconfig"
1523
osource "$PKGS_DIR/Kconfig"
1624
rsource "../libraries/Kconfig"
17-
source "$(BSP_DIR)/board/Kconfig"
25+
26+
if !RT_USING_NANO
27+
rsource "$(BSP_DIR)/board/Kconfig"
28+
endif

bsp/renesas/ra6e2-ek/board/Kconfig

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
menu "Hardware Drivers Config"
22

3-
config SOC_R7FA6E2BB
4-
bool
5-
select SOC_SERIES_R7FA6E2
6-
select ARCH_ARM_CORTEX_SECURE
7-
select RT_USING_COMPONENTS_INIT
8-
select RT_USING_USER_MAIN
9-
default y
10-
113
menu "Onboard Peripheral Drivers"
124

135
endmenu
146

157
menu "On-chip Peripheral Drivers"
168

17-
rsource "../../libraries/HAL_Drivers/Kconfig"
18-
9+
rsource "../../libraries/HAL_Drivers/drivers/Kconfig"
1910
menuconfig BSP_USING_UART
2011
bool "Enable UART"
2112
default y

bsp/renesas/ra6e2-ek/project.uvoptx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@
448448
<tvExp>0</tvExp>
449449
<tvExpOptDlg>0</tvExpOptDlg>
450450
<bDave2>0</bDave2>
451-
<PathWithFileName>..\libraries\HAL_Drivers\drv_common.c</PathWithFileName>
452-
<FilenameWithoutPath>drv_common.c</FilenameWithoutPath>
451+
<PathWithFileName>..\libraries\HAL_Drivers\drivers\drv_gpio.c</PathWithFileName>
452+
<FilenameWithoutPath>drv_gpio.c</FilenameWithoutPath>
453453
<RteFlg>0</RteFlg>
454454
<bShared>0</bShared>
455455
</File>
@@ -460,8 +460,8 @@
460460
<tvExp>0</tvExp>
461461
<tvExpOptDlg>0</tvExpOptDlg>
462462
<bDave2>0</bDave2>
463-
<PathWithFileName>..\libraries\HAL_Drivers\drv_gpio.c</PathWithFileName>
464-
<FilenameWithoutPath>drv_gpio.c</FilenameWithoutPath>
463+
<PathWithFileName>..\libraries\HAL_Drivers\drivers\drv_usart_v2.c</PathWithFileName>
464+
<FilenameWithoutPath>drv_usart_v2.c</FilenameWithoutPath>
465465
<RteFlg>0</RteFlg>
466466
<bShared>0</bShared>
467467
</File>
@@ -472,8 +472,8 @@
472472
<tvExp>0</tvExp>
473473
<tvExpOptDlg>0</tvExpOptDlg>
474474
<bDave2>0</bDave2>
475-
<PathWithFileName>..\libraries\HAL_Drivers\drv_usart_v2.c</PathWithFileName>
476-
<FilenameWithoutPath>drv_usart_v2.c</FilenameWithoutPath>
475+
<PathWithFileName>..\libraries\HAL_Drivers\drv_common.c</PathWithFileName>
476+
<FilenameWithoutPath>drv_common.c</FilenameWithoutPath>
477477
<RteFlg>0</RteFlg>
478478
<bShared>0</bShared>
479479
</File>
@@ -516,8 +516,8 @@
516516
<tvExp>0</tvExp>
517517
<tvExpOptDlg>0</tvExpOptDlg>
518518
<bDave2>0</bDave2>
519-
<PathWithFileName>..\..\..\components\finsh\shell.c</PathWithFileName>
520-
<FilenameWithoutPath>shell.c</FilenameWithoutPath>
519+
<PathWithFileName>..\..\..\components\finsh\cmd.c</PathWithFileName>
520+
<FilenameWithoutPath>cmd.c</FilenameWithoutPath>
521521
<RteFlg>0</RteFlg>
522522
<bShared>0</bShared>
523523
</File>
@@ -528,8 +528,8 @@
528528
<tvExp>0</tvExp>
529529
<tvExpOptDlg>0</tvExpOptDlg>
530530
<bDave2>0</bDave2>
531-
<PathWithFileName>..\..\..\components\finsh\cmd.c</PathWithFileName>
532-
<FilenameWithoutPath>cmd.c</FilenameWithoutPath>
531+
<PathWithFileName>..\..\..\components\finsh\shell.c</PathWithFileName>
532+
<FilenameWithoutPath>shell.c</FilenameWithoutPath>
533533
<RteFlg>0</RteFlg>
534534
<bShared>0</bShared>
535535
</File>
@@ -724,8 +724,8 @@
724724
<tvExp>0</tvExp>
725725
<tvExpOptDlg>0</tvExpOptDlg>
726726
<bDave2>0</bDave2>
727-
<PathWithFileName>..\..\..\src\klibc\rt_vsscanf.c</PathWithFileName>
728-
<FilenameWithoutPath>rt_vsscanf.c</FilenameWithoutPath>
727+
<PathWithFileName>..\..\..\src\klibc\kstring.c</PathWithFileName>
728+
<FilenameWithoutPath>kstring.c</FilenameWithoutPath>
729729
<RteFlg>0</RteFlg>
730730
<bShared>0</bShared>
731731
</File>
@@ -748,8 +748,8 @@
748748
<tvExp>0</tvExp>
749749
<tvExpOptDlg>0</tvExpOptDlg>
750750
<bDave2>0</bDave2>
751-
<PathWithFileName>..\..\..\src\klibc\kerrno.c</PathWithFileName>
752-
<FilenameWithoutPath>kerrno.c</FilenameWithoutPath>
751+
<PathWithFileName>..\..\..\src\klibc\rt_vsnprintf_tiny.c</PathWithFileName>
752+
<FilenameWithoutPath>rt_vsnprintf_tiny.c</FilenameWithoutPath>
753753
<RteFlg>0</RteFlg>
754754
<bShared>0</bShared>
755755
</File>
@@ -760,8 +760,8 @@
760760
<tvExp>0</tvExp>
761761
<tvExpOptDlg>0</tvExpOptDlg>
762762
<bDave2>0</bDave2>
763-
<PathWithFileName>..\..\..\src\klibc\rt_vsnprintf_tiny.c</PathWithFileName>
764-
<FilenameWithoutPath>rt_vsnprintf_tiny.c</FilenameWithoutPath>
763+
<PathWithFileName>..\..\..\src\klibc\rt_vsscanf.c</PathWithFileName>
764+
<FilenameWithoutPath>rt_vsscanf.c</FilenameWithoutPath>
765765
<RteFlg>0</RteFlg>
766766
<bShared>0</bShared>
767767
</File>
@@ -772,8 +772,8 @@
772772
<tvExp>0</tvExp>
773773
<tvExpOptDlg>0</tvExpOptDlg>
774774
<bDave2>0</bDave2>
775-
<PathWithFileName>..\..\..\src\klibc\kstring.c</PathWithFileName>
776-
<FilenameWithoutPath>kstring.c</FilenameWithoutPath>
775+
<PathWithFileName>..\..\..\src\klibc\kerrno.c</PathWithFileName>
776+
<FilenameWithoutPath>kerrno.c</FilenameWithoutPath>
777777
<RteFlg>0</RteFlg>
778778
<bShared>0</bShared>
779779
</File>

bsp/renesas/ra6e2-ek/project.uvprojx

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,9 @@
338338
<v6Rtti>0</v6Rtti>
339339
<VariousControls>
340340
<MiscControls>-Wno-license-management -Wuninitialized -Wall -Wmissing-declarations -Wpointer-arith -Waggregate-return -Wfloat-equal</MiscControls>
341-
<Define>RT_USING_LIBC, __STDC_LIMIT_MACROS, RT_USING_ARMLIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__</Define>
341+
<Define>RT_USING_LIBC, __RTTHREAD__, RT_USING_ARMLIBC, __STDC_LIMIT_MACROS, __CLK_TCK=RT_TICK_PER_SECOND</Define>
342342
<Undefine></Undefine>
343-
<IncludePath>..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\smp_call;.;..\..\..\components\drivers\include;..\libraries\HAL_Drivers;..\..\..\libcpu\arm\common;..\..\..\components\drivers\phy;..\..\..\components\drivers\include;..\..\..\components\libc\posix\ipc;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;..\..\..\components\libc\posix\io\poll;board\ports;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;board;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\libc\compilers\common\include</IncludePath>
343+
<IncludePath>..\..\..\components\drivers\include;..\..\..\components\drivers\phy;..\libraries\HAL_Drivers;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\posix\io\epoll;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\poll;.;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\smp_call;..\..\..\components\finsh;..\..\..\include;board\ports;board;..\libraries\HAL_Drivers\drivers\config;..\..\..\components\libc\compilers\common\include;..\libraries\HAL_Drivers\drivers;..\..\..\components\libc\posix\ipc;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\libcpu\arm\common</IncludePath>
344344
</VariousControls>
345345
</Cads>
346346
<Aads>
@@ -1107,9 +1107,9 @@
11071107
<GroupName>Drivers</GroupName>
11081108
<Files>
11091109
<File>
1110-
<FileName>drv_common.c</FileName>
1110+
<FileName>drv_gpio.c</FileName>
11111111
<FileType>1</FileType>
1112-
<FilePath>..\libraries\HAL_Drivers\drv_common.c</FilePath>
1112+
<FilePath>..\libraries\HAL_Drivers\drivers\drv_gpio.c</FilePath>
11131113
<FileOption>
11141114
<CommonProperty>
11151115
<UseCPPCompiler>2</UseCPPCompiler>
@@ -1163,9 +1163,9 @@
11631163
</FileOption>
11641164
</File>
11651165
<File>
1166-
<FileName>drv_gpio.c</FileName>
1166+
<FileName>drv_usart_v2.c</FileName>
11671167
<FileType>1</FileType>
1168-
<FilePath>..\libraries\HAL_Drivers\drv_gpio.c</FilePath>
1168+
<FilePath>..\libraries\HAL_Drivers\drivers\drv_usart_v2.c</FilePath>
11691169
<FileOption>
11701170
<CommonProperty>
11711171
<UseCPPCompiler>2</UseCPPCompiler>
@@ -1219,9 +1219,9 @@
12191219
</FileOption>
12201220
</File>
12211221
<File>
1222-
<FileName>drv_usart_v2.c</FileName>
1222+
<FileName>drv_common.c</FileName>
12231223
<FileType>1</FileType>
1224-
<FilePath>..\libraries\HAL_Drivers\drv_usart_v2.c</FilePath>
1224+
<FilePath>..\libraries\HAL_Drivers\drv_common.c</FilePath>
12251225
<FileOption>
12261226
<CommonProperty>
12271227
<UseCPPCompiler>2</UseCPPCompiler>
@@ -1290,14 +1290,14 @@
12901290
<FilePath>..\..\..\components\finsh\msh_parse.c</FilePath>
12911291
</File>
12921292
<File>
1293-
<FileName>shell.c</FileName>
1293+
<FileName>cmd.c</FileName>
12941294
<FileType>1</FileType>
1295-
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
1295+
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
12961296
</File>
12971297
<File>
1298-
<FileName>cmd.c</FileName>
1298+
<FileName>shell.c</FileName>
12991299
<FileType>1</FileType>
1300-
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
1300+
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
13011301
</File>
13021302
</Files>
13031303
</Group>
@@ -2094,29 +2094,29 @@
20942094
<GroupName>klibc</GroupName>
20952095
<Files>
20962096
<File>
2097-
<FileName>rt_vsscanf.c</FileName>
2097+
<FileName>kstring.c</FileName>
20982098
<FileType>1</FileType>
2099-
<FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath>
2099+
<FilePath>..\..\..\src\klibc\kstring.c</FilePath>
21002100
</File>
21012101
<File>
21022102
<FileName>kstdio.c</FileName>
21032103
<FileType>1</FileType>
21042104
<FilePath>..\..\..\src\klibc\kstdio.c</FilePath>
21052105
</File>
21062106
<File>
2107-
<FileName>kerrno.c</FileName>
2107+
<FileName>rt_vsnprintf_tiny.c</FileName>
21082108
<FileType>1</FileType>
2109-
<FilePath>..\..\..\src\klibc\kerrno.c</FilePath>
2109+
<FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath>
21102110
</File>
21112111
<File>
2112-
<FileName>rt_vsnprintf_tiny.c</FileName>
2112+
<FileName>rt_vsscanf.c</FileName>
21132113
<FileType>1</FileType>
2114-
<FilePath>..\..\..\src\klibc\rt_vsnprintf_tiny.c</FilePath>
2114+
<FilePath>..\..\..\src\klibc\rt_vsscanf.c</FilePath>
21152115
</File>
21162116
<File>
2117-
<FileName>kstring.c</FileName>
2117+
<FileName>kerrno.c</FileName>
21182118
<FileType>1</FileType>
2119-
<FilePath>..\..\..\src\klibc\kstring.c</FilePath>
2119+
<FilePath>..\..\..\src\klibc\kerrno.c</FilePath>
21202120
</File>
21212121
</Files>
21222122
</Group>

bsp/renesas/ra6e2-ek/src/hal_entry.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010

1111
#include <rtthread.h>
1212
#include "hal_data.h"
13+
#ifdef RT_USING_NANO
14+
#include <drv_gpio.h>
15+
#else
1316
#include <rtdevice.h>
17+
#endif /* RT_USING_NANO */
1418

1519
#define LED1_PIN BSP_IO_PORT_02_PIN_07 /* Onboard LED1 pins */
1620
#define LED2_PIN BSP_IO_PORT_04_PIN_00 /* Onboard LED2 pins */

0 commit comments

Comments
 (0)