Skip to content

Commit 4f59d55

Browse files
kurisaWtomjielii
kurisaW
authored and
tomjielii
committed
bsp: all Renesas bsp support the nano one-click switch. (RT-Thread#10629)
* bsp: all Renesas bsp support the nano one-click switch. * fix pr conflicts.
1 parent 719fc50 commit 4f59d55

6 files changed

Lines changed: 67 additions & 0 deletions

File tree

‎bsp/renesas/libraries/Kconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ config SOC_SERIES_R7FA2A1
6767
select SOC_FAMILY_RENESAS_RA
6868
default n
6969
<<<<<<< HEAD
70+
<<<<<<< HEAD
71+
=======
72+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
7073

7174
if RT_USING_NANO
7275
choice
@@ -95,5 +98,8 @@ config RT_NANO_CONSOLE_UART9
9598
bool "UART9"
9699
endchoice
97100
endif
101+
<<<<<<< HEAD
98102
=======
99103
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
104+
=======
105+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)

‎bsp/renesas/ra2a1-ek/.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<<<<<<< HEAD
2+
<<<<<<< HEAD
23
CONFIG_SOC_R7FA2A1AB=y
34
=======
45
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
6+
=======
7+
CONFIG_SOC_R7FA2A1AB=y
8+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
59

610
#
711
# RT-Thread Kernel
@@ -223,9 +227,13 @@ CONFIG_FINSH_THREAD_STACK_SIZE=4096
223227
CONFIG_FINSH_USING_HISTORY=y
224228
CONFIG_FINSH_HISTORY_LINES=5
225229
<<<<<<< HEAD
230+
<<<<<<< HEAD
226231
# CONFIG_FINSH_USING_WORD_OPERATION is not set
227232
=======
228233
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
234+
=======
235+
# CONFIG_FINSH_USING_WORD_OPERATION is not set
236+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
229237
CONFIG_FINSH_USING_SYMTAB=y
230238
CONFIG_FINSH_CMD_SIZE=80
231239
CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
@@ -404,9 +412,13 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
404412
# CONFIG_PKG_USING_NANOPB is not set
405413
# CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set
406414
<<<<<<< HEAD
415+
<<<<<<< HEAD
407416
# CONFIG_PKG_USING_ESP_HOSTED is not set
408417
=======
409418
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
419+
=======
420+
# CONFIG_PKG_USING_ESP_HOSTED is not set
421+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
410422

411423
#
412424
# Wi-Fi
@@ -1414,9 +1426,12 @@ CONFIG_SOC_SERIES_R7FA2A1=y
14141426
# Hardware Drivers Config
14151427
#
14161428
<<<<<<< HEAD
1429+
<<<<<<< HEAD
14171430
=======
14181431
CONFIG_SOC_R7FA2A1AB=y
14191432
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
1433+
=======
1434+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
14201435

14211436
#
14221437
# Onboard Peripheral Drivers
@@ -1436,10 +1451,15 @@ CONFIG_BSP_USING_UART0=y
14361451
CONFIG_BSP_UART0_RX_BUFSIZE=256
14371452
CONFIG_BSP_UART0_TX_BUFSIZE=0
14381453
<<<<<<< HEAD
1454+
<<<<<<< HEAD
14391455
# CONFIG_BSP_USING_UART1 is not set
14401456
# CONFIG_BSP_USING_UART9 is not set
14411457
=======
14421458
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
1459+
=======
1460+
# CONFIG_BSP_USING_UART1 is not set
1461+
# CONFIG_BSP_USING_UART9 is not set
1462+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
14431463
# end of On-chip Peripheral Drivers
14441464

14451465
#

‎bsp/renesas/ra2a1-ek/Kconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ PKGS_DIR := packages
1212
ENV_DIR := /
1313

1414
<<<<<<< HEAD
15+
<<<<<<< HEAD
16+
=======
17+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
1518
config SOC_R7FA2A1AB
1619
bool
1720
select SOC_SERIES_R7FA2A1
1821
select RT_USING_COMPONENTS_INIT
1922
select RT_USING_USER_MAIN
2023
default y
2124

25+
<<<<<<< HEAD
2226
source "$(RTT_DIR)/Kconfig"
2327
osource "$PKGS_DIR/Kconfig"
2428
rsource "../libraries/Kconfig"
@@ -32,3 +36,12 @@ osource "$PKGS_DIR/Kconfig"
3236
rsource "../libraries/Kconfig"
3337
source "$(BSP_DIR)/board/Kconfig"
3438
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
39+
=======
40+
source "$(RTT_DIR)/Kconfig"
41+
osource "$PKGS_DIR/Kconfig"
42+
rsource "../libraries/Kconfig"
43+
44+
if !RT_USING_NANO
45+
rsource "$(BSP_DIR)/board/Kconfig"
46+
endif
47+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)

‎bsp/renesas/ra2a1-ek/board/Kconfig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
menu "Hardware Drivers Config"
22

3+
<<<<<<< HEAD
34
<<<<<<< HEAD
45
=======
56
config SOC_R7FA2A1AB
@@ -10,17 +11,23 @@ menu "Hardware Drivers Config"
1011
default y
1112

1213
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
14+
=======
15+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
1316
menu "Onboard Peripheral Drivers"
1417

1518
endmenu
1619

1720
menu "On-chip Peripheral Drivers"
1821

22+
<<<<<<< HEAD
1923
<<<<<<< HEAD
2024
rsource "../../libraries/HAL_Drivers/drivers/Kconfig"
2125
=======
2226
rsource "../../libraries/HAL_Drivers/Kconfig"
2327
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
28+
=======
29+
rsource "../../libraries/HAL_Drivers/drivers/Kconfig"
30+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
2431

2532
menuconfig BSP_USING_UART
2633
bool "Enable UART"

‎bsp/renesas/ra2a1-ek/rtconfig.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#ifndef RT_CONFIG_H__
22
#define RT_CONFIG_H__
33

4+
<<<<<<< HEAD
45
<<<<<<< HEAD
56
#define SOC_R7FA2A1AB
67

78
=======
89
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
10+
=======
11+
#define SOC_R7FA2A1AB
12+
13+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
914
/* RT-Thread Kernel */
1015

1116
/* klibc options */
@@ -413,11 +418,14 @@
413418

414419
/* Hardware Drivers Config */
415420

421+
<<<<<<< HEAD
416422
<<<<<<< HEAD
417423
=======
418424
#define SOC_R7FA2A1AB
419425

420426
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
427+
=======
428+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
421429
/* Onboard Peripheral Drivers */
422430

423431
/* On-chip Peripheral Drivers */

‎bsp/renesas/ra2a1-ek/src/hal_entry.c‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,46 @@
1111
#include <rtthread.h>
1212
#include "hal_data.h"
1313
<<<<<<< HEAD
14+
<<<<<<< HEAD
15+
=======
16+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
1417
#ifdef RT_USING_NANO
1518
#include <drv_gpio.h>
1619
#else
1720
#include <rtdevice.h>
1821
#endif /* RT_USING_NANO */
1922

23+
<<<<<<< HEAD
2024
=======
2125
#include <rtdevice.h>
2226
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
27+
=======
28+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
2329
#define LED_PIN BSP_IO_PORT_02_PIN_05 /* Onboard LED pins */
2430

2531
void hal_entry(void)
2632
{
2733
rt_kprintf("\nHello RT-Thread!\n");
2834
while (1)
35+
<<<<<<< HEAD
2936
<<<<<<< HEAD
3037
{
3138
=======
3239
{
3340
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
41+
=======
42+
{
43+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)
3444
rt_pin_write(LED_PIN, PIN_HIGH);
3545
rt_thread_mdelay(500);
3646
rt_pin_write(LED_PIN, PIN_LOW);
3747
rt_thread_mdelay(500);
3848
}
3949
}
4050
<<<<<<< HEAD
51+
<<<<<<< HEAD
4152
=======
4253

4354
>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
55+
=======
56+
>>>>>>> aef8bb9611... bsp: all Renesas bsp support the nano one-click switch. (#10629)

0 commit comments

Comments
 (0)