From 6edf99efb3c5e243938310db6f6ba848d2f707e4 Mon Sep 17 00:00:00 2001 From: rtel Date: Wed, 23 Apr 2014 13:59:56 +0000 Subject: [PATCH] Update IAR XMC4200 project to fix link error that resulted from updating the IAR version to 7.x. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2236 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../RTOSDemo.ewd | 212 +++++++++++++++--- .../RTOSDemo.ewp | 39 +++- .../XMC4200.icf | 35 +++ .../settings/RTOSDemo.dbgdt | 8 +- .../settings/RTOSDemo.dni | 43 ++-- .../settings/RTOSDemo.wsdt | 12 +- 6 files changed, 266 insertions(+), 83 deletions(-) create mode 100644 FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd index bb7b199e8..507d92ec5 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewd @@ -12,7 +12,7 @@ C-SPY 2 - 25 + 26 1 1 + + + + + + @@ -257,7 +281,7 @@ CMSISDAP_ID 2 - 0 + 2 1 1 + + + + + + @@ -472,7 +520,7 @@ IJET_ID 2 - 2 + 3 1 1 + @@ -1254,19 +1306,15 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin 0 @@ -1309,7 +1357,7 @@ C-SPY 2 - 25 + 26 1 1 + + + + + + @@ -1554,7 +1626,7 @@ CMSISDAP_ID 2 - 0 + 2 1 1 + + + + + + @@ -1769,7 +1865,7 @@ IJET_ID 2 - 2 + 3 1 1 + @@ -2551,19 +2651,15 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin 0 @@ -2606,7 +2702,7 @@ C-SPY 2 - 25 + 26 1 1 + + + + + + @@ -2851,7 +2971,7 @@ CMSISDAP_ID 2 - 0 + 2 1 1 + + + + + + @@ -3066,7 +3210,7 @@ IJET_ID 2 - 2 + 3 1 1 + @@ -3848,19 +3996,15 @@ 0 - $TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Quadros\Quadros_EWB6_Plugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin 0 - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp index 402737146..0f9ad3179 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/RTOSDemo.ewp @@ -87,7 +87,7 @@ @@ -1023,7 +1028,7 @@ @@ -1638,11 +1648,11 @@ diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf new file mode 100644 index 000000000..de2b789a2 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/XMC4200.icf @@ -0,0 +1,35 @@ +/*###ICF### Section handled by ICF editor, don't touch! ****/ +/*-Editor annotation file-*/ +/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ +/*-Specials-*/ +define symbol __ICFEDIT_intvec_start__ = 0x08000000; +/*-Memory Regions-*/ +define symbol __ICFEDIT_region_ROM_start__ = 0x08000000; +define symbol __ICFEDIT_region_ROM_end__ = 0x0803FFFF; +define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; +define symbol __ICFEDIT_region_RAM_end__ = 0x20005FFF; +/*-Sizes-*/ +define symbol __ICFEDIT_size_cstack__ = 0x400; +define symbol __ICFEDIT_size_heap__ = 0x4; +/**** End of ICF editor section. ###ICF###*/ + +define symbol __PSRAM_start__ = 0x1FFFC000; +define symbol __PSRAM_end__ = 0x1FFFFFFF; + +define memory mem with size = 4G; +define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__]; +define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__]; +define region PSRAM_region = mem:[from __PSRAM_start__ to __PSRAM_end__]; + +define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__{ }; +define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__{ }; + +initialize by copy {readwrite}; +do not initialize {section .noinit}; + +place at address mem:__ICFEDIT_intvec_start__ {readonly section .intvec}; + +place in ROM_region {readonly}; +place in RAM_region {readwrite, + block CSTACK, block HEAP}; +place in PSRAM_region{section .psram}; \ No newline at end of file diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt index 2c5201687..a29e99ddd 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dbgdt @@ -44,7 +44,7 @@ - + TabID-11908-23542 @@ -56,20 +56,20 @@ - 0TabID-5604-9989Debug LogDebug-Log0 + 0TabID-5604-9989Debug LogDebug-Log0 - TextEditor$WS_DIR$\main.c000008456115611TextEditor$WS_DIR$\main_blinky.c0000018898339833TextEditor$WS_DIR$\main_full.c000006300TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM4F\port.c000003481450314503TextEditor$WS_DIR$\..\..\Source\portable\IAR\ARM_CM4F\portasm.s0000010447894789TextEditor$WS_DIR$\system\startup_XMC4400.s000002541485814858TextEditor$WS_DIR$\RegTest.s000001145036503660100000010000001 + TextEditor$WS_DIR$\main.c0000010059095909TextEditor$WS_DIR$\main_full.c0000015386548654TextEditor$WS_DIR$\..\..\Source\queue.c000001621537255372520100000010000001 - iaridepm.enu1debuggergui.enu1armjlink.enu1-2-2692279-2-2200200119048203666167262706721-2-21981682-2-216842001002381203666119048203666 + iaridepm.enu1debuggergui.enu1armjlink.enu1-2-2692279-2-2200200119048203666167262706721-2-21981682-2-216842001002381203666119048203666 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni index eab10c6d4..7a2dc855f 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.dni @@ -9,7 +9,7 @@ TriggerName=main LimitSize=0 ByteLimit=50 [DebugChecksum] -Checksum=92877996 +Checksum=1444046619 [Exceptions] StopOnUncaught=_ 0 StopOnThrow=_ 0 @@ -23,9 +23,9 @@ CStepIntDis=_ 0 OverrideDefaultClocks=0 CpuClock=72000000 ClockAutoDetect=0 -ClockWanted=2000000 -JtagSpeed=2000000 -Prescaler=36 +ClockWanted=1000000 +JtagSpeed=1000000 +Prescaler=72 TimeStampPrescIndex=0 TimeStampPrescData=0 PcSampCYCTAP=1 @@ -36,13 +36,22 @@ ITMportsEnable=0 ITMportsTermIO=0 ITMportsLogFile=0 ITMlogFile=$PROJ_DIR$\ITM.log +[SWOTraceWindow] +PcSampling=0 +InterruptLogs=0 +ForcedTimeStamps=0 +EventCPI=0 +EventEXC=0 +EventFOLD=0 +EventLSU=0 +EventSLEEP=0 [PowerLog] LogEnabled=0 GraphEnabled=0 ShowTimeLog=1 ShowTimeSum=0 -Title0=I0 -Symbol0=0 4 1 +Title_0=I0 +Symbol_0=0 4 227 LiveEnabled=0 LiveFile=PowerLogLive.log [DataLog] @@ -57,14 +66,6 @@ SumEnabled=0 GraphEnabled=0 ShowTimeLog=1 ShowTimeSum=1 -Title0=Ch0 -Symbol0=0 4 1 -Title1=Ch1 -Symbol1=0 4 1 -Title2=Ch2 -Symbol2=0 4 1 -Title3=Ch3 -Symbol3=0 4 1 SumSortOrder=0 [InterruptLog] LogEnabled=0 @@ -80,24 +81,12 @@ Category=_ 0 [TermIOLog] LoggingEnabled=_ 0 LogFile=_ "" -[Trace2] +[CallStackLog] Enabled=0 -ShowSource=0 -[SWOTraceWindow] -PcSampling=0 -InterruptLogs=0 -ForcedTimeStamps=0 -EventCPI=0 -EventEXC=0 -EventFOLD=0 -EventLSU=0 -EventSLEEP=0 [PowerProbe] Frequency=10000 Probe0=I0 ProbeSetup0=2 1 1 2 0 0 -[CallStackLog] -Enabled=0 [DriverProfiling] Enabled=0 Mode=3 diff --git a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt index b531a9bd8..52332e268 100644 --- a/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt +++ b/FreeRTOS/Demo/CORTEX_M4F_Infineon_XMC4000_IAR/settings/RTOSDemo.wsdt @@ -25,7 +25,7 @@ - + TabID-29494-21985 @@ -33,11 +33,11 @@ Workspace - RTOSDemoRTOSDemo/Common_Demo_SourceRTOSDemo/FreeRTOS_SourceRTOSDemo/System + RTOSDemo - 0 + 0 TabID-28344-23030 @@ -47,20 +47,20 @@ TabID-19430-2343Debug LogDebug-Log - 0 + 0 - TextEditor$WS_DIR$\main.c00000605611561100100000010000001 + TextEditor$WS_DIR$\main.c0000064590959090TextEditor$WS_DIR$\main_full.c000006286548654TextEditor$WS_DIR$\main_blinky.c0000063000100000010000001 - iaridepm.enu1-2-2740389-2-2200200119048203666232738755601-2-21981682-2-216842001002381203666119048203666 + iaridepm.enu1-2-2740389-2-2200200119048203666232738755601-2-21981682-2-216842001002381203666119048203666 -- 2.39.5