Browse Source

[Renesas]Fix ra6m3 build error

Rbb666 2 years ago
parent
commit
ae78aedfac

+ 2 - 0
.github/workflows/action.yml

@@ -199,6 +199,8 @@ jobs:
         #  - {RTT_BSP: "stm32/stm32wl55-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
         #  - {RTT_BSP: "stm32/stm32wle5-yizhilian-lm401", RTT_TOOL_CHAIN: "sourcery-arm"}
         #  - {RTT_BSP: "stm32/stm32wle5-yizhilian-lm402", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "renesas/ra6m3-ek", RTT_TOOL_CHAIN: "sourcery-arm"}
+         - {RTT_BSP: "renesas/ra6m4-cpk", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "wch/arm/ch32f103c8-core", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "wch/arm/ch32f203r-evt", RTT_TOOL_CHAIN: "sourcery-arm"}
          - {RTT_BSP: "synwit/swm320", RTT_TOOL_CHAIN: "sourcery-arm"}

+ 1 - 3
bsp/renesas/ra6m3-ek/.settings/standalone.prefs

@@ -1,10 +1,8 @@
-#Wed Jan 11 18:29:06 CST 2023
+#Tue Jan 31 18:32:07 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\#\#HAL\ Drivers\#\#all\#\#r_ether_phy\#\#\#\#3.5.0/all=180607401,ra/fsp/src/r_ether_phy/targets/DP83620/r_ether_phy_target_dp83620.c|809828733,ra/fsp/src/r_ether_phy/targets/KSZ8091RNB/r_ether_phy_target_ksz8091rnb.c|1059783364,ra/fsp/inc/instances/r_ether_phy.h|2050444946,ra/fsp/inc/api/r_ether_phy_api.h|451576276,ra/fsp/src/r_ether_phy/r_ether_phy.c|4014538643,ra/fsp/src/r_ether_phy/targets/KSZ8041/r_ether_phy_target_ksz8041.c
 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\#\#HAL\ Drivers\#\#all\#\#r_ether_phy\#\#\#\#3.5.0/libraries=
 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

+ 1 - 11
bsp/renesas/ra6m3-ek/README.md

@@ -35,19 +35,9 @@
 | :----------------- | :----------------- | :------------- |
 | UART               | 支持               | UART7 为默认日志输出端口 |
 | GPIO               | 支持               |                |
-| GPIO         | 支持         |                          |
-| IIC          | 支持         | 软件                     |
-| WDT          | 支持         |                          |
-| RTC          | 支持         |                          |
-| ADC          | 支持         |                          |
-| DAC          | 支持         |                          |
-| SPI          | 支持         |                          |
-| FLASH        | 支持         |                |
-| PWM          | 支持         |                |
 | LCD          | 支持         |                          |
-| G2D  | 支持 |                |
-| JPEG         | 支持         |                          |
 
+* 注意:仓库刚拉下来是最小系统,若需添加/使能其他外设需参考:[外设驱动使用教程 (rt-thread.org)](https://www.rt-thread.org/document/site/#/rt-thread-version/rt-thread-standard/tutorial/make-bsp/renesas-ra/RA系列BSP外设驱动使用教程)
 
 ## 使用说明
 

+ 3 - 0
bsp/renesas/ra6m3-ek/buildinfo.gpdsc

@@ -71,6 +71,7 @@
         <file category="source" name="ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c"/>
         <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=""/>
@@ -100,6 +101,7 @@
         <file category="header" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.h" path=""/>
         <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_register_protection.o"/>
         <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.c"/>
+        <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_rom_registers.o"/>
         <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.c"/>
         <file category="other" name="ra/fsp/src/bsp/mcu/all/bsp_sbrk.o"/>
         <file category="source" name="ra/fsp/src/bsp/mcu/all/bsp_security.c"/>
@@ -109,6 +111,7 @@
         <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_elc.h" path=""/>
         <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_feature.h" path=""/>
         <file category="header" name="ra/fsp/src/bsp/mcu/ra6m3/bsp_mcu_info.h" path=""/>
+        <file category="other" name="ra/fsp/src/r_ether_phy/r_ether_phy.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"/>

+ 0 - 19
bsp/renesas/ra6m3-ek/configuration.xml

@@ -165,10 +165,6 @@
       <description>SCI UART</description>
       <originalPack>Renesas.RA.3.5.0.pack</originalPack>
     </component>
-    <component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_ether_phy" variant="" vendor="Renesas" version="3.5.0">
-      <description>Ethernet PHY</description>
-      <originalPack>Renesas.RA.3.5.0.pack</originalPack>
-    </component>
   </raComponentSelection>
   <raElcConfiguration/>
   <raIcuConfiguration/>
@@ -207,28 +203,13 @@
       <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.ether_phy_on_ether_phy.1137705372">
-      <property id="module.driver.ether_phy.name" value="g_ether_phy0"/>
-      <property id="module.driver.ether_phy.channel" value="module.driver.ether_phy.channel.0"/>
-      <property id="module.driver.ether_phy.phy_lsi_address" value="0"/>
-      <property id="module.driver.ether_phy.phy_reset_wait_time" value="0x00020000"/>
-      <property id="module.driver.ether_phy.mii_type" value="module.driver.mii_type.rmii"/>
-      <property id="module.driver.ether_phy.mii_bit_access_wait_time" value="8"/>
-      <property id="module.driver.ether_phy.flow_control" value="module.driver.ether_phy.flow_control.0"/>
-    </module>
     <context id="_hal.0">
       <stack module="module.driver.ioport_on_ioport.0"/>
       <stack module="module.driver.uart_on_sci_uart.136564520"/>
-      <stack module="module.driver.ether_phy_on_ether_phy.1137705372"/>
     </context>
     <config id="config.driver.ioport">
       <property id="config.driver.ioport.checking" value="config.driver.ioport.checking.system"/>
     </config>
-    <config id="config.driver.ether_phy">
-      <property id="config.driver.ether_phy.param_checking_enable" value="config.driver.ether_phy.param_checking_enable.bsp"/>
-      <property id="config.driver.ether_phy.use_phy" value="config.driver.ether_phy.use_phy.default"/>
-      <property id="config.driver.ether_phy.use_reference_clock" value="config.driver.ether_phy.use_reference_clock.default"/>
-    </config>
     <config id="config.driver.sci_uart">
       <property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
       <property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>

+ 0 - 22
bsp/renesas/ra6m3-ek/ra_gen/hal_data.c

@@ -1,27 +1,5 @@
 /* generated HAL source file - do not edit */
 #include "hal_data.h"
-ether_phy_instance_ctrl_t g_ether_phy0_ctrl;
-
-const ether_phy_cfg_t g_ether_phy0_cfg =
-{
-
-    .channel                   = 0,
-    .phy_lsi_address           = 0,
-    .phy_reset_wait_time       = 0x00020000,
-    .mii_bit_access_wait_time  = 8,
-    .flow_control              = ETHER_PHY_FLOW_CONTROL_DISABLE,
-    .mii_type                  = ETHER_PHY_MII_TYPE_RMII,
-    .p_context                 = NULL,
-    .p_extend                  = NULL,
-
-};
-/* Instance structure to use this module. */
-const ether_phy_instance_t g_ether_phy0 =
-{
-    .p_ctrl        = &g_ether_phy0_ctrl,
-    .p_cfg         = &g_ether_phy0_cfg,
-    .p_api         = &g_ether_phy_on_ether_phy
-};
 sci_uart_instance_ctrl_t     g_uart7_ctrl;
 
             baud_setting_t               g_uart7_baud_setting =

+ 0 - 8
bsp/renesas/ra6m3-ek/ra_gen/hal_data.h

@@ -4,17 +4,9 @@
 #include <stdint.h>
 #include "bsp_api.h"
 #include "common_data.h"
-#include "r_ether_phy.h"
-#include "r_ether_phy_api.h"
 #include "r_sci_uart.h"
             #include "r_uart_api.h"
 FSP_HEADER
-/** ether_phy on ether_phy Instance. */
-extern const ether_phy_instance_t g_ether_phy0;
-
-/** Access the Ethernet PHY instance using these structures when calling API functions directly (::p_api is not used). */
-extern ether_phy_instance_ctrl_t g_ether_phy0_ctrl;
-extern const ether_phy_cfg_t g_ether_phy0_cfg;
 /** UART on SCI Instance. */
             extern const uart_instance_t      g_uart7;