[bsp][renesas]add EK-RA2A1 support RT-Thread#10610

Author: CYFS3

bsp/renesas/libraries/Kconfig

@@ -66,6 +66,7 @@ config SOC_SERIES_R7FA2A1
     select ARCH_ARM_CORTEX_M23
     select SOC_FAMILY_RENESAS_RA
     default n
+<<<<<<< HEAD
 
 if RT_USING_NANO
 choice
@@ -94,3 +95,5 @@ config RT_NANO_CONSOLE_UART9
     bool "UART9"
 endchoice
 endif
+=======
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610

bsp/renesas/ra2a1-ek/.config

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 CONFIG_SOC_R7FA2A1AB=y
+=======
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 
 #
 # RT-Thread Kernel
@@ -123,12 +126,17 @@ CONFIG_RT_THREAD_PRIORITY_32=y
 CONFIG_RT_THREAD_PRIORITY_MAX=32
 CONFIG_RT_TICK_PER_SECOND=1000
 CONFIG_RT_USING_OVERFLOW_CHECK=y
+<<<<<<< HEAD
 <<<<<<< HEAD:bsp/renesas/ra2a1-ek/.config
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_HOOK_USING_FUNC_PTR=y
 =======
 # CONFIG_RT_USING_HOOK is not set
 >>>>>>> f8e8201ebe... nxp bsp support: frdm-mcxa346 (#10625):bsp/renesas/ra2e2-ek/.config
+=======
+CONFIG_RT_USING_HOOK=y
+CONFIG_RT_HOOK_USING_FUNC_PTR=y
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 # CONFIG_RT_USING_HOOKLIST is not set
 CONFIG_RT_USING_IDLE_HOOK=y
 CONFIG_RT_IDLE_HOOK_LIST_SIZE=4
@@ -214,7 +222,10 @@ CONFIG_FINSH_THREAD_PRIORITY=20
 CONFIG_FINSH_THREAD_STACK_SIZE=4096
 CONFIG_FINSH_USING_HISTORY=y
 CONFIG_FINSH_HISTORY_LINES=5
+<<<<<<< HEAD
 # CONFIG_FINSH_USING_WORD_OPERATION is not set
+=======
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 CONFIG_FINSH_USING_SYMTAB=y
 CONFIG_FINSH_CMD_SIZE=80
 CONFIG_MSH_USING_BUILT_IN_COMMANDS=y
@@ -392,7 +403,10 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
 # CONFIG_PKG_USING_FREEMODBUS is not set
 # CONFIG_PKG_USING_NANOPB is not set
 # CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set
+<<<<<<< HEAD
 # CONFIG_PKG_USING_ESP_HOSTED is not set
+=======
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 
 #
 # Wi-Fi
@@ -1399,6 +1413,10 @@ CONFIG_SOC_SERIES_R7FA2A1=y
 #
 # Hardware Drivers Config
 #
+<<<<<<< HEAD
+=======
+CONFIG_SOC_R7FA2A1AB=y
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 
 #
 # Onboard Peripheral Drivers
@@ -1417,8 +1435,11 @@ CONFIG_BSP_USING_UART0=y
 # CONFIG_BSP_UART0_TX_USING_DMA is not set
 CONFIG_BSP_UART0_RX_BUFSIZE=256
 CONFIG_BSP_UART0_TX_BUFSIZE=0
+<<<<<<< HEAD
 # CONFIG_BSP_USING_UART1 is not set
 # CONFIG_BSP_USING_UART9 is not set
+=======
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
 # end of On-chip Peripheral Drivers
 
 #

bsp/renesas/ra2a1-ek/.secure_azone

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <azone>
+<<<<<<< HEAD
     <rzone name="R7FA2E2A72DNK.rzone"/>
     <partition>
         <peripheral name="PORT0.CM23" group="PORT">
@@ -8,11 +9,21 @@
         <peripheral name="PORT1.CM23" group="PORT">
             <slot name="P100.CM23" secure="false"/>
             <slot name="P101.CM23" secure="false"/>
+=======
+    <rzone name="R7FA2A1AB3CFM.rzone"/>
+    <partition>
+        <peripheral name="PORT0.CM23" group="PORT">
+            <slot name="P001.CM23" secure="false"/>
+            <slot name="P003.CM23" secure="false"/>
+        </peripheral>
+        <peripheral name="PORT1.CM23" group="PORT">
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
             <slot name="P108.CM23" secure="false"/>
             <slot name="P111.CM23" secure="false"/>
             <slot name="P112.CM23" secure="false"/>
         </peripheral>
         <peripheral name="PORT2.CM23" group="PORT">
+<<<<<<< HEAD
             <slot name="P205.CM23" secure="false"/>
         </peripheral>
         <peripheral name="PORT3.CM23" group="PORT">
@@ -31,6 +42,35 @@
             <slot name="IRQ5.CM23" secure="false"/>
             <slot name="IRQ6.CM23" secure="false"/>
             <slot name="IRQ7.CM23" secure="false"/>
+=======
+            <slot name="P201.CM23" secure="false"/>
+            <slot name="P205.CM23" secure="false"/>
+            <slot name="P206.CM23" secure="false"/>
+        </peripheral>
+        <peripheral name="PORT3.CM23" group="PORT">
+            <slot name="P300.CM23" secure="false"/>
+            <slot name="P301.CM23" secure="false"/>
+            <slot name="P302.CM23" secure="false"/>
+            <slot name="P303.CM23" secure="false"/>
+            <slot name="P304.CM23" secure="false"/>
+        </peripheral>
+        <peripheral name="PORT4.CM23" group="PORT">
+            <slot name="P407.CM23" secure="false"/>
+            <slot name="P409.CM23" secure="false"/>
+            <slot name="P410.CM23" secure="false"/>
+            <slot name="P411.CM23" secure="false"/>
+        </peripheral>
+        <peripheral name="PORT9.CM23" group="PORT">
+            <slot name="P914.CM23" secure="false"/>
+            <slot name="P915.CM23" secure="false"/>
+        </peripheral>
+        <peripheral name="SCI0.CM23" group="SCI" security=""/>
+        <peripheral name="ICU.CM23">
+            <slot name="IRQ0.CM23" secure="false"/>
+            <slot name="IRQ1.CM23" secure="false"/>
+            <slot name="IRQ2.CM23" secure="false"/>
+            <slot name="IRQ3.CM23" secure="false"/>
+>>>>>>> b8c77dcc44... [bsp][renesas]add EK-RA2A1 support #10610
         </peripheral>
     </partition>
 </azone>