Skip to content

Commit 939a95e

Browse files
committed
Merge branch 'rx_development_v10.4.3-rx-1.0.9' into 'rx_development_v10.4.3'
[Update][Issue] Update default config of RXv3 DPFPU-support devices See merge request products/common/rtos/amazon-freertos/freertos-kernel!1
2 parents 14dd956 + 91d146e commit 939a95e

File tree

5 files changed

+114
-8
lines changed

5 files changed

+114
-8
lines changed

configuration/freertos.mdf

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,13 @@ This is required to ensure flase positive timing errors are not reported.</descr
390390
<description>Enable: use task notification
391391
Disable: do not use task notification</description>
392392
</property>
393-
<property id="configUSE_TASK_DPFPU_SUPPORT" display="Use double-precision floating-point unit (DPFPU) support" default="0" type="checkbox">
394-
<option id="configUSE_TASK_DPFPU_SUPPORT.0" display="Disable" value="0"/>
395-
<option id="configUSE_TASK_DPFPU_SUPPORT.1" display="Enable" value="1"/>
396-
<description>Enable: use task DPFPU support
397-
Disable: do not use task DPFPU support</description>
393+
<property id="configUSE_TASK_DPFPU_SUPPORT" display="Use double-precision floating-point unit (DPFPU) support" default="0" type="combobox">
394+
<option id="configUSE_TASK_DPFPU_SUPPORT.0" display="Disable DPFPU support" value="0"/>
395+
<option id="configUSE_TASK_DPFPU_SUPPORT.1" display="Enable or disable DPFPU support for each task" value="1"/>
396+
<option id="configUSE_TASK_DPFPU_SUPPORT.2" display="Enable DPFPU support for all tasks" value="2"/>
397+
<description>Disable DPFPU support: You can not use DPFPU instructions because all tasks do not have DPFPU context.
398+
Enable or disable DPFPU support for each task: A task does not have DPFPU context by default. If enabling DPFPU context in a task, you must call vPortTaskusesDPFPU() in this task before using DPFPU instructions.
399+
Enable DPFPU support for all tasks: All tasks have DPFPU context by default.</description>
398400
</property>
399401
<property id="configRECORD_STACK_HIGH_ADDRESS" display="Record stack high address" default="0" type="checkbox">
400402
<option id="configRECORD_STACK_HIGH_ADDRESS.0" display="Disable" value="0"/>

configuration/freertos.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,49 @@
337337
<path>src/FreeRTOS/Source/portable/Renesas/RX100</path>
338338
</impdir>
339339
<scfgtemplate>
340+
<group>RX130</group>
341+
<group>RX140</group>
342+
<group>RX230</group>
343+
<group>RX231</group>
344+
<group>RX23W</group>
345+
<group>RX23E-A</group>
346+
<group>RX23E-B</group>
347+
<group>RX24T</group>
348+
<group>RX26T</group>
349+
<group>RX64M</group>
350+
<group>RX651</group>
351+
<group>RX65N</group>
352+
<group>RX66T</group>
353+
<group>RX660</group>
354+
<group>RX71M</group>
355+
<group>RX72T</group>
340356
<path>configuration/patch_files/common_scfg.ftl</path>
341357
</scfgtemplate>
358+
<scfgtemplate>
359+
<group>RX66N</group>
360+
<group>RX671</group>
361+
<group>RX72M</group>
362+
<group>RX72N</group>
363+
<path>configuration/patch_files/RXv3/rxv3_scfg.ftl</path>
364+
</scfgtemplate>
365+
<additionaloption>
366+
<toolchain>GNURX</toolchain>
367+
<group>RX66N</group>
368+
<group>RX671</group>
369+
<group>RX72M</group>
370+
<group>RX72N</group>
371+
<optionid>com.renesas.cdt.managedbuild.gcc.core.option.cpu.64bitdouble</optionid>
372+
<value>true</value>
373+
</additionaloption>
374+
<additionaloption>
375+
<toolchain>GNURX</toolchain>
376+
<group>RX66N</group>
377+
<group>RX671</group>
378+
<group>RX72M</group>
379+
<group>RX72N</group>
380+
<optionid>com.renesas.cdt.managedbuild.gcc.core.option.cpu.doubleFPU</optionid>
381+
<value>true</value>
382+
</additionaloption>
342383
</package>
343384
<!-- Heap Information. The purpose is to provide information to estimate Heap Size -->
344385
<!-- The redundant zero number before a numerical data may cause it to be wrong, because some numerical data are input of an javascript engine -->
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<smc>
3+
<general version="2.0.0.0">
4+
<configuration active="true" id="${configurationTypeReleaseID}">
5+
<property id="com.renesas.smc.service.project.buildArtefactType" values="com.renesas.smc.service.project.buildArtefactType.exe"/>
6+
<toolchain id="${toolChainID}">
7+
<option id="com.renesas.smc.toolchain.option.language" key="com.renesas.smc.toolchain.option.language.c"/>
8+
<option id="com.renesas.smc.toolchain.option.buildArtefactType" key="com.renesas.smc.toolchain.option.buildArtefactType.exe"/>
9+
<option id="com.renesas.smc.toolchain.option.rtos" key="com.renesas.smc.toolchain.option.rtos.freertos.kernel">
10+
<item id="com.renesas.smc.toolchain.option.rtos.freertos.kernel" value="${packageVersion}"/>
11+
</option>
12+
<option id="com.renesas.smc.toolchain.option.dual" key="com.renesas.smc.toolchain.option.dual.false"/>
13+
</toolchain>
14+
</configuration>
15+
<platform id="${targetDevice}"/>
16+
</general>
17+
<tool id="SWComponent" version="1.0.0.0">
18+
<configuration inuse="true" name="r_bsp">
19+
<component description="Dependencies : None&#10;The r_bsp package provides a foundation for code to be built on top of. It provides startup code, iodefines, and MCU information for different boards. There are 2 folders that make up the r_bsp package. The 'mcu' folder contains files that are common to a MCU group. These files provide functionality such as easy register access, CPU functions, and a file named 'mcu_info.h' for each MCU group. The 'mcu_info.h' file has information about the MCU on the board and is configured based on the information given in r_bsp_config.h. The information in 'mcu_info.h' is used to help configure Renesas middleware that uses the r_bsp package. The 'board' folder has a folder with startup code for each supported board. Which MCU and board is chosen is decided by the settings in 'platform.h'. The user can choose which board they are using by uncommenting the include path that applies to their board. For example, if you are using the RSK+RX64M then you would uncomment the #include &quot;./board/generic_rx64m/r_bsp.h&quot; include path. Users are encouraged to add their own boards to the 'board' directory. BSPs are configured by using the r_bsp_config.h file. Each board will have a reference configuration file named r_bsp_config_reference.h. The user should copy this file to their project, rename it to r_bsp_config.h, and use the options inside the file to configure the BSP for their project." detailDescription="Board Support Packages." display="r_bsp" id="r_bsp7.42" version="7.42"/>
20+
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
21+
</configuration>
22+
<configuration enable="true" exclude="false" id="8ccb1927-571f-4edb-b61c-d5beefbf1ab7" inuse="true" name="FreeRTOS_Kernel">
23+
<component description="This component is a part of RTOS Configurator feature that allow user to use the GUI to configure kernel setting of FreeRTOS." detailDescription="" display="FreeRTOS_Kernel" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.kernel" version="1.0.130">
24+
<gridItem id="configUSE_TASK_DPFPU_SUPPORT" selectedIndex="2"/>
25+
</component>
26+
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
27+
</configuration>
28+
<configuration enable="true" exclude="false" inuse="true" name="FreeRTOS Object">
29+
<allocatable id="" name="" type="">
30+
<allocatable id="TASK" name="TASK" type="">
31+
<allocatable id="TASKOBJECTLINK1" name="TASK" type="" readonly="true">
32+
<option defaultValue="1" id="Initialize" value="0"/>
33+
<option defaultValue="task_[X]" id="TaskCode" value="main_task"/>
34+
<option defaultValue="task_[X]" id="TaskName" value="MAIN_TASK"/>
35+
<option defaultValue="512" id="StackSize" value="512"/>
36+
<option defaultValue="NULL" id="TaskHandler" value="NULL"/>
37+
<option defaultValue="NULL" id="Parameter" value="NULL"/>
38+
<option defaultValue="1" id="Priority" value="3"/>
39+
</allocatable>
40+
<option defaultValue="0" id="LinkNum" value="1"/>
41+
</allocatable>
42+
<allocatable id="QUEUE" name="QUEUE" type="">
43+
<option defaultValue="0" id="LinkNum" value=""/>
44+
</allocatable>
45+
<allocatable id="SEMAPHORE" name="SEMAPHORE" type="">
46+
<option defaultValue="0" id="LinkNum" value=""/>
47+
</allocatable>
48+
<allocatable id="SWTIMER" name="SWTIMER" type="">
49+
<option defaultValue="0" id="LinkNum" value=""/>
50+
</allocatable>
51+
<allocatable id="EVENTGROUP" name="EVENTGROUP" type="">
52+
<option defaultValue="0" id="LinkNum" value=""/>
53+
</allocatable>
54+
<allocatable id="STREAMBUFFER" name="STREAMBUFFER" type="">
55+
<option defaultValue="0" id="LinkNum" value=""/>
56+
</allocatable>
57+
<allocatable id="MESSAGEBUFFER" name="MESSAGEBUFFER" type="">
58+
<option defaultValue="0" id="LinkNum" value=""/>
59+
</allocatable>
60+
</allocatable>
61+
<component description="This component is a part of RTOS Configurator feature that allow user to use the GUI to create and configure new object of FreeRTOS." detailDescription="" display="FreeRTOS_Object" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.freertos.object" version="1.0.121"/>
62+
<source description="Code generator for Real-time OS" display="RTOS Configurator" id="com.renesas.smc.tools.swcomponent.rtosconfigurator.source"/>
63+
</configuration>
64+
</tool>
65+
</smc>

configuration/patch_files/common_scfg.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</general>
1717
<tool id="SWComponent" version="1.0.0.0">
1818
<configuration inuse="true" name="r_bsp">
19-
<component description="Dependencies : None&#10;The r_bsp package provides a foundation for code to be built on top of. It provides startup code, iodefines, and MCU information for different boards. There are 2 folders that make up the r_bsp package. The 'mcu' folder contains files that are common to a MCU group. These files provide functionality such as easy register access, CPU functions, and a file named 'mcu_info.h' for each MCU group. The 'mcu_info.h' file has information about the MCU on the board and is configured based on the information given in r_bsp_config.h. The information in 'mcu_info.h' is used to help configure Renesas middleware that uses the r_bsp package. The 'board' folder has a folder with startup code for each supported board. Which MCU and board is chosen is decided by the settings in 'platform.h'. The user can choose which board they are using by uncommenting the include path that applies to their board. For example, if you are using the RSK+RX64M then you would uncomment the #include &quot;./board/generic_rx64m/r_bsp.h&quot; include path. Users are encouraged to add their own boards to the 'board' directory. BSPs are configured by using the r_bsp_config.h file. Each board will have a reference configuration file named r_bsp_config_reference.h. The user should copy this file to their project, rename it to r_bsp_config.h, and use the options inside the file to configure the BSP for their project." detailDescription="Board Support Packages." display="r_bsp" id="r_bsp7.41" version="7.41"/>
19+
<component description="Dependencies : None&#10;The r_bsp package provides a foundation for code to be built on top of. It provides startup code, iodefines, and MCU information for different boards. There are 2 folders that make up the r_bsp package. The 'mcu' folder contains files that are common to a MCU group. These files provide functionality such as easy register access, CPU functions, and a file named 'mcu_info.h' for each MCU group. The 'mcu_info.h' file has information about the MCU on the board and is configured based on the information given in r_bsp_config.h. The information in 'mcu_info.h' is used to help configure Renesas middleware that uses the r_bsp package. The 'board' folder has a folder with startup code for each supported board. Which MCU and board is chosen is decided by the settings in 'platform.h'. The user can choose which board they are using by uncommenting the include path that applies to their board. For example, if you are using the RSK+RX64M then you would uncomment the #include &quot;./board/generic_rx64m/r_bsp.h&quot; include path. Users are encouraged to add their own boards to the 'board' directory. BSPs are configured by using the r_bsp_config.h file. Each board will have a reference configuration file named r_bsp_config_reference.h. The user should copy this file to their project, rename it to r_bsp_config.h, and use the options inside the file to configure the BSP for their project." detailDescription="Board Support Packages." display="r_bsp" id="r_bsp7.42" version="7.42"/>
2020
<source description="Components supporting Firmware Integration Technology" display="Firmware Integration Technology" id="com.renesas.smc.tools.swcomponent.fit.source"/>
2121
</configuration>
2222
<configuration enable="true" exclude="false" id="8ccb1927-571f-4edb-b61c-d5beefbf1ab7" inuse="true" name="FreeRTOS_Kernel">

portable/GCC/RX700v3_DPFPU/port.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
* Implementation of functions defined in portable.h for the RXv3 DPFPU port.
3030
*----------------------------------------------------------*/
3131

32-
#warning Testing for DFPU support in this port is not yet complete
33-
3432
/* Scheduler includes. */
3533
#include "FreeRTOS.h"
3634
#include "task.h"

0 commit comments

Comments
 (0)