Skip to content

Commit d291404

Browse files
RichardBarryRichardBarry
committed
Update the GCC and IAR SiFive HiFive rev-b demos to use the new configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRESS constants in place of the deprecated configCLINT_BASE_ADDRESS constant.
Update the IAR RISC-V HiFive demo to use the latest IAR Embedded Workbench version.
1 parent 066e2bc commit d291404

File tree

15 files changed

+2123
-1688
lines changed

15 files changed

+2123
-1688
lines changed

‎FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1-RevB_FreedomStudio/.cproject‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.1023181676" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
3737

38+
<option id="cdt.managedbuild.option.gnu.cross.path.2116215758" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" value="C:\devtools\FreedomStudio-2019-08-2-win64\SiFive\riscv64-unknown-elf-gcc-8.3.0-2019.08.0\bin" valueType="string"/>
39+
3840
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1119183919" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
3941

4042
<builder buildPath="${workspace_loc:/RTOSDemo}/Debug" id="cdt.managedbuild.builder.gnu.cross.1388532167" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>

‎FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1-RevB_FreedomStudio/.settings/language.settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
1313

14-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-316647897902857" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
14+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1852838222473283" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
1515

1616
<language-scope id="org.eclipse.cdt.core.gcc"/>
1717

‎FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1-RevB_FreedomStudio/FreeRTOSConfig.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
* See http://www.freertos.org/a00110.html.
4141
*----------------------------------------------------------*/
4242
#define CLINT_CTRL_ADDR ( 0x02000000UL )
43-
#define configCLINT_BASE_ADDRESS CLINT_CTRL_ADDR
43+
#define configMTIME_BASE_ADDRESS ( CLINT_CTRL_ADDR + 0xBFF8UL )
44+
#define configMTIMECMP_BASE_ADDRESS ( CLINT_CTRL_ADDR + 0x4000UL )
4445
#define configUSE_PREEMPTION 1
4546
#define configUSE_IDLE_HOOK 0
4647
#define configUSE_TICK_HOOK 1

‎FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1-RevB_IAR/FreeRTOSConfig.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
*----------------------------------------------------------*/
4242

4343
#define configISR_STACK_SIZE_WORDS ( 200 )
44-
#define configCLINT_BASE_ADDRESS 0x2000000
44+
#define CLINT_CTRL_ADDR ( 0x02000000UL )
45+
#define configMTIME_BASE_ADDRESS ( CLINT_CTRL_ADDR + 0xBFF8UL )
46+
#define configMTIMECMP_BASE_ADDRESS ( CLINT_CTRL_ADDR + 0x4000UL )
4547

4648
#define configUSE_PREEMPTION 1
4749
#define configUSE_IDLE_HOOK 0

‎FreeRTOS/Demo/RISC-V_RV32_SiFive_HiFive1-RevB_IAR/RTOSDemo.ewd‎

Lines changed: 224 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<debug>1</debug>
1010
<settings>
1111
<name>C-SPY</name>
12-
<archiveVersion>1</archiveVersion>
12+
<archiveVersion>2</archiveVersion>
1313
<data>
14-
<version>0</version>
14+
<version>1</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>1</debug>
1717
<option>
@@ -138,13 +138,45 @@
138138
<name>MassEraseBeforeFlashing</name>
139139
<state>0</state>
140140
</option>
141+
<option>
142+
<name>OCMulticoreNrOfCores</name>
143+
<state>1</state>
144+
</option>
145+
<option>
146+
<name>OCMulticoreWorkspace</name>
147+
<state></state>
148+
</option>
149+
<option>
150+
<name>OCMulticoreSlaveProject</name>
151+
<state></state>
152+
</option>
153+
<option>
154+
<name>OCMulticoreSlaveConfiguration</name>
155+
<state></state>
156+
</option>
157+
<option>
158+
<name>OCAttachSlave</name>
159+
<state>0</state>
160+
</option>
161+
<option>
162+
<name>OCMulticoreNrOfCoresSlave</name>
163+
<state>1</state>
164+
</option>
165+
<option>
166+
<name>OCMulticoreAMPConfigType</name>
167+
<state>0</state>
168+
</option>
169+
<option>
170+
<name>OCMulticoreSessionFile</name>
171+
<state></state>
172+
</option>
141173
</data>
142174
</settings>
143175
<settings>
144176
<name>IJETRISCV</name>
145177
<archiveVersion>2</archiveVersion>
146178
<data>
147-
<version>0</version>
179+
<version>1</version>
148180
<wantNonLocal>1</wantNonLocal>
149181
<debug>1</debug>
150182
<option>
@@ -277,11 +309,87 @@
277309
<name>FlashBoardPathSlave</name>
278310
<state>0</state>
279311
</option>
312+
<option>
313+
<name>RDICatchNmi</name>
314+
<state>0</state>
315+
</option>
316+
<option>
317+
<name>RDICatchInstrMis</name>
318+
<state>0</state>
319+
</option>
320+
<option>
321+
<name>RDICatchInstrFault</name>
322+
<state>0</state>
323+
</option>
324+
<option>
325+
<name>RDICatchIllegalInstr</name>
326+
<state>0</state>
327+
</option>
328+
<option>
329+
<name>RDICatchLoadMis</name>
330+
<state>0</state>
331+
</option>
332+
<option>
333+
<name>RDICatchLoadFault</name>
334+
<state>0</state>
335+
</option>
336+
<option>
337+
<name>RDICatchStoreAddr</name>
338+
<state>0</state>
339+
</option>
340+
<option>
341+
<name>RDICatchStoreAccess</name>
342+
<state>0</state>
343+
</option>
344+
<option>
345+
<name>RDICatchEnvironment</name>
346+
<state>0</state>
347+
</option>
348+
<option>
349+
<name>RDICatchInstrPage</name>
350+
<state>0</state>
351+
</option>
352+
<option>
353+
<name>RDICatchLoadPage</name>
354+
<state>0</state>
355+
</option>
356+
<option>
357+
<name>RDICatchStorePage</name>
358+
<state>0</state>
359+
</option>
360+
<option>
361+
<name>RDICatchExternal</name>
362+
<state>0</state>
363+
</option>
364+
<option>
365+
<name>RDICatchTimer</name>
366+
<state>0</state>
367+
</option>
368+
<option>
369+
<name>RDICatchSoftware</name>
370+
<state>0</state>
371+
</option>
372+
<option>
373+
<name>RDICatchModeM</name>
374+
<state>0</state>
375+
</option>
376+
<option>
377+
<name>RDICatchModeS</name>
378+
<state>0</state>
379+
</option>
380+
<option>
381+
<name>RDICatchModeU</name>
382+
<state>0</state>
383+
</option>
384+
<option>
385+
<name>GDelayAfterOverride</name>
386+
<state>0</state>
387+
</option>
280388
</data>
281389
</settings>
282390
<settings>
283391
<name>SIMRISCV</name>
284-
<archiveVersion>1</archiveVersion>
392+
<archiveVersion>2</archiveVersion>
285393
<data>
286394
<version>0</version>
287395
<wantNonLocal>1</wantNonLocal>
@@ -323,9 +431,9 @@
323431
<debug>0</debug>
324432
<settings>
325433
<name>C-SPY</name>
326-
<archiveVersion>1</archiveVersion>
434+
<archiveVersion>2</archiveVersion>
327435
<data>
328-
<version>0</version>
436+
<version>1</version>
329437
<wantNonLocal>1</wantNonLocal>
330438
<debug>0</debug>
331439
<option>
@@ -452,13 +560,45 @@
452560
<name>MassEraseBeforeFlashing</name>
453561
<state>0</state>
454562
</option>
563+
<option>
564+
<name>OCMulticoreNrOfCores</name>
565+
<state></state>
566+
</option>
567+
<option>
568+
<name>OCMulticoreWorkspace</name>
569+
<state></state>
570+
</option>
571+
<option>
572+
<name>OCMulticoreSlaveProject</name>
573+
<state></state>
574+
</option>
575+
<option>
576+
<name>OCMulticoreSlaveConfiguration</name>
577+
<state></state>
578+
</option>
579+
<option>
580+
<name>OCAttachSlave</name>
581+
<state>0</state>
582+
</option>
583+
<option>
584+
<name>OCMulticoreNrOfCoresSlave</name>
585+
<state>1</state>
586+
</option>
587+
<option>
588+
<name>OCMulticoreAMPConfigType</name>
589+
<state>0</state>
590+
</option>
591+
<option>
592+
<name>OCMulticoreSessionFile</name>
593+
<state></state>
594+
</option>
455595
</data>
456596
</settings>
457597
<settings>
458598
<name>IJETRISCV</name>
459599
<archiveVersion>2</archiveVersion>
460600
<data>
461-
<version>0</version>
601+
<version>1</version>
462602
<wantNonLocal>1</wantNonLocal>
463603
<debug>0</debug>
464604
<option>
@@ -591,11 +731,87 @@
591731
<name>FlashBoardPathSlave</name>
592732
<state>0</state>
593733
</option>
734+
<option>
735+
<name>RDICatchNmi</name>
736+
<state>0</state>
737+
</option>
738+
<option>
739+
<name>RDICatchInstrMis</name>
740+
<state>0</state>
741+
</option>
742+
<option>
743+
<name>RDICatchInstrFault</name>
744+
<state>0</state>
745+
</option>
746+
<option>
747+
<name>RDICatchIllegalInstr</name>
748+
<state>0</state>
749+
</option>
750+
<option>
751+
<name>RDICatchLoadMis</name>
752+
<state>0</state>
753+
</option>
754+
<option>
755+
<name>RDICatchLoadFault</name>
756+
<state>0</state>
757+
</option>
758+
<option>
759+
<name>RDICatchStoreAddr</name>
760+
<state>0</state>
761+
</option>
762+
<option>
763+
<name>RDICatchStoreAccess</name>
764+
<state>0</state>
765+
</option>
766+
<option>
767+
<name>RDICatchEnvironment</name>
768+
<state>0</state>
769+
</option>
770+
<option>
771+
<name>RDICatchInstrPage</name>
772+
<state>0</state>
773+
</option>
774+
<option>
775+
<name>RDICatchLoadPage</name>
776+
<state>0</state>
777+
</option>
778+
<option>
779+
<name>RDICatchStorePage</name>
780+
<state>0</state>
781+
</option>
782+
<option>
783+
<name>RDICatchExternal</name>
784+
<state>0</state>
785+
</option>
786+
<option>
787+
<name>RDICatchTimer</name>
788+
<state>0</state>
789+
</option>
790+
<option>
791+
<name>RDICatchSoftware</name>
792+
<state>0</state>
793+
</option>
794+
<option>
795+
<name>RDICatchModeM</name>
796+
<state>0</state>
797+
</option>
798+
<option>
799+
<name>RDICatchModeS</name>
800+
<state>0</state>
801+
</option>
802+
<option>
803+
<name>RDICatchModeU</name>
804+
<state>0</state>
805+
</option>
806+
<option>
807+
<name>GDelayAfterOverride</name>
808+
<state>0</state>
809+
</option>
594810
</data>
595811
</settings>
596812
<settings>
597813
<name>SIMRISCV</name>
598-
<archiveVersion>1</archiveVersion>
814+
<archiveVersion>2</archiveVersion>
599815
<data>
600816
<version>0</version>
601817
<wantNonLocal>1</wantNonLocal>

0 commit comments

Comments
 (0)