From abb318a9c56ab4bf9af4dc12a6979b1720ad905f Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 7 Aug 2015 02:24:25 +1200 Subject: [PATCH 1/3] Adding support to Build with ARM DS5 tools. Define the DEVICE_TYPE in the DeviceCode/Targets/Native *.settings files under COMPILER_TOOL==DS5 Condition In Framework/Tools/BuildTasks/ScatterFile.cs, add DS5 as a valid COMPILER_TOOL option along with RVDS and MDK to ensure the scatter files are processed. Keil MDK 5.05 compiler is the same as DS5 version 5.05 compiler, so copy the existing MDK scatter files to DS5 equivalients for the build system to be happy. Longer term solution is to consider defining a common ARM tool name to avoid duplications for RVDS, MDK and DS5. Add DS5 block to setenv_base.cmd. Note the ARMCC50BIN, ARMCC50LIB and ARMCC50INC are not used and can be deleted. (Consider removing from MDK block too) Modify tools/Targets/Microsoft.SPOT.System.Targets to include quotes around file names and paths. Needs review of other Settings/Targets files. This is to copy with end users who may have a '+' or ' ' in the folder names. Add Settings/Targets files for DS5 based on MDK versions with pre v 5.05 MDK items removed. --- .../Targets/Native/STM32/STM32.settings | 5 +- .../Targets/Native/STM32F4/STM32F2.settings | 5 +- .../Targets/Native/STM32F4/STM32F4.settings | 5 +- Framework/Tools/BuildTasks/ScatterFile.cs | 2 +- .../scatterfile_microbooter_ds5.xml | 118 ++++++ .../TinyBooter/scatterfile_bootloader_ds5.xml | 158 +++++++ .../TinyCLR/scatterfile_tinyclr_ds5.xml | 191 +++++++++ .../TinyCLR_NONET/scatterfile_tinyclr_ds5.xml | 186 +++++++++ .../scatterfile_tinyclr_nonet_ds5.xml | 187 +++++++++ .../TinyBooter/scatterfile_bootloader_ds5.xml | 125 ++++++ .../TinyCLR/scatterfile_tinyclr_ds5.xml | 147 +++++++ setenv_base.cmd | 26 ++ setenv_ds5.cmd | 16 + tools/Targets/Microsoft.SPOT.System.Targets | 10 +- .../Microsoft.Spot.system.ds5.settings | 32 ++ .../Targets/Microsoft.Spot.system.ds5.targets | 384 ++++++++++++++++++ 16 files changed, 1588 insertions(+), 9 deletions(-) create mode 100644 Solutions/MCBSTM32F400/MicroBooter/scatterfile_microbooter_ds5.xml create mode 100644 Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_ds5.xml create mode 100644 Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_ds5.xml create mode 100644 Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_ds5.xml create mode 100644 Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_nonet_ds5.xml create mode 100644 Solutions/STM32F4DISCOVERY/TinyBooter/scatterfile_bootloader_ds5.xml create mode 100644 Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_ds5.xml create mode 100644 setenv_ds5.cmd create mode 100644 tools/Targets/Microsoft.Spot.system.ds5.settings create mode 100644 tools/Targets/Microsoft.Spot.system.ds5.targets diff --git a/DeviceCode/Targets/Native/STM32/STM32.settings b/DeviceCode/Targets/Native/STM32/STM32.settings index 861c946f3..6d58ddf35 100644 --- a/DeviceCode/Targets/Native/STM32/STM32.settings +++ b/DeviceCode/Targets/Native/STM32/STM32.settings @@ -19,7 +19,10 @@ Copyright Oberon microsystems, Inc. - + + Cortex-M3 + {F7823E3C-8BCE-4D9A-AD56-9E06063C47CD} + Cortex-M3 {1942C531-3AAC-4abb-8B4F-C3111012F9D9} diff --git a/DeviceCode/Targets/Native/STM32F4/STM32F2.settings b/DeviceCode/Targets/Native/STM32F4/STM32F2.settings index 13a94b71b..6bbc6947d 100644 --- a/DeviceCode/Targets/Native/STM32F4/STM32F2.settings +++ b/DeviceCode/Targets/Native/STM32F4/STM32F2.settings @@ -22,7 +22,10 @@ - + + Cortex-M3 + {F7823E3C-8BCE-4D9A-AD56-9E06063C47CD} + Cortex-M3 {1942C531-3AAC-4abb-8B4F-C3111012F9D9} diff --git a/DeviceCode/Targets/Native/STM32F4/STM32F4.settings b/DeviceCode/Targets/Native/STM32F4/STM32F4.settings index e3ff84b9e..f16cc8d99 100644 --- a/DeviceCode/Targets/Native/STM32F4/STM32F4.settings +++ b/DeviceCode/Targets/Native/STM32F4/STM32F4.settings @@ -20,7 +20,10 @@ - + + Cortex-M3 + {F7823E3C-8BCE-4D9A-AD56-9E06063C47CD} + Cortex-M4.fp {00C50096-00DD-00E7-BBA9-7FC84D408562} diff --git a/Framework/Tools/BuildTasks/ScatterFile.cs b/Framework/Tools/BuildTasks/ScatterFile.cs index 0cef7738f..f2a2fb5fe 100644 --- a/Framework/Tools/BuildTasks/ScatterFile.cs +++ b/Framework/Tools/BuildTasks/ScatterFile.cs @@ -573,7 +573,7 @@ internal object Parse( System.Xml.XmlNode node ) string name = node.Name; IParse o = null; - if (GetVariable("COMPILER_TOOL").ToUpper() == "RVDS" || GetVariable("COMPILER_TOOL").ToUpper() == "MDK") + if (GetVariable("COMPILER_TOOL").ToUpper() == "RVDS" || GetVariable("COMPILER_TOOL").ToUpper() == "MDK" || GetVariable("COMPILER_TOOL").ToUpper() == "DS5") { if (name == "ScatterFile") o = new Group(); else if (name == "Set") o = new Variable(); diff --git a/Solutions/MCBSTM32F400/MicroBooter/scatterfile_microbooter_ds5.xml b/Solutions/MCBSTM32F400/MicroBooter/scatterfile_microbooter_ds5.xml new file mode 100644 index 000000000..712bf5a90 --- /dev/null +++ b/Solutions/MCBSTM32F400/MicroBooter/scatterfile_microbooter_ds5.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_ds5.xml b/Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_ds5.xml new file mode 100644 index 000000000..0cf8c3e21 --- /dev/null +++ b/Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_ds5.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_ds5.xml b/Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_ds5.xml new file mode 100644 index 000000000..fa7d3426e --- /dev/null +++ b/Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_ds5.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_ds5.xml b/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_ds5.xml new file mode 100644 index 000000000..461dae0be --- /dev/null +++ b/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_ds5.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_nonet_ds5.xml b/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_nonet_ds5.xml new file mode 100644 index 000000000..f419ebf76 --- /dev/null +++ b/Solutions/MCBSTM32F400/TinyCLR_NONET/scatterfile_tinyclr_nonet_ds5.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/STM32F4DISCOVERY/TinyBooter/scatterfile_bootloader_ds5.xml b/Solutions/STM32F4DISCOVERY/TinyBooter/scatterfile_bootloader_ds5.xml new file mode 100644 index 000000000..d4dcc6f1c --- /dev/null +++ b/Solutions/STM32F4DISCOVERY/TinyBooter/scatterfile_bootloader_ds5.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_ds5.xml b/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_ds5.xml new file mode 100644 index 000000000..b0cca27cc --- /dev/null +++ b/Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_ds5.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/setenv_base.cmd b/setenv_base.cmd index 2c014e54e..e0b129374 100644 --- a/setenv_base.cmd +++ b/setenv_base.cmd @@ -96,6 +96,7 @@ rem set tool-chain specific environment variables IF /I "%COMPILER_TOOL%"=="VS" GOTO :SET_VS_VARS IF /I "%COMPILER_TOOL%"=="GCC" GOTO :SET_GCC_VARS IF /I "%COMPILER_TOOL%"=="MDK" GOTO :SET_MDK_VARS +IF /I "%COMPILER_TOOL%"=="DS5" GOTO :SET_DS5_VARS IF "%COMPILER_TOOL%"=="" GOTO :ERROR @@ -186,7 +187,32 @@ GOTO :EOF @ECHO. GOTO :EOF +rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +:SET_DS5_VARS +@ECHO Setting DS5 env var and path for version %COMPILER_TOOL_VERSION% + +rem use a default for MDK +set NO_ADS_WRAPPER=1 +set DOTNETMF_COMPILER=%COMPILER_TOOL_VERSION% + +IF "%ARG3%"=="" set ARG3=%SystemDrive%\Program Files\DS-5 v5.22.0\sw\ARMCompiler5.05u2 +IF NOT EXIST "%ARG3%" GOTO :BAD_DS5_ARG + +SET DS5_TOOL_PATH=%ARG3% +SET PATH=%DS5_TOOL_PATH%\bin;%PATH% +SET ARMCC50BIN=%DS5_TOOL_PATH%\BIN +SET ARMCC50LIB=%DS5_TOOL_PATH%\LIB +SET ARMCC50INC=%DS5_TOOL_PATH%\INCLUDE + +GOTO :EOF + +:BAD_DS5_ARG +@ECHO. +@ECHO Error - Invalid argument. Could not find DS5 path %ARG3%. +@ECHO. + +GOTO :EOF rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ :SET_VS_VARS set VSSDK12INSTALLDIR=%SPOROOT%\tools\x86\MicrosoftSDKs\VSSDK\vs12\ diff --git a/setenv_ds5.cmd b/setenv_ds5.cmd new file mode 100644 index 000000000..42bb4a49a --- /dev/null +++ b/setenv_ds5.cmd @@ -0,0 +1,16 @@ +@echo off + +IF NOT ""=="%1" SET DS5_VER=%1 +IF ""=="%DS5_VER%" GOTO :ARG_ERROR + +%~dp0\setenv_base.cmd DS5 %DS5_VER% %2 %3 %4 %5 + +GOTO :EOF + +:ARG_ERROR +@echo. +@echo ERROR: Invalid version argument. +@echo USAGE: setenv_ds.cmd DS5_VERSION [DS5_TOOL_PATH] +@echo where DS5_VERSION is the version of the compiler contained in the MDK/RVDS/DS5 (e.g for MDK 5.14 ARMCC is 5.05) +@echo where DS5_TOOL_PATH is the path to the ARM directory of the DS install (i.e. c:\Keil_v5\Arm) +@echo. \ No newline at end of file diff --git a/tools/Targets/Microsoft.SPOT.System.Targets b/tools/Targets/Microsoft.SPOT.System.Targets index 5b854c458..5ae1a48cf 100644 --- a/tools/Targets/Microsoft.SPOT.System.Targets +++ b/tools/Targets/Microsoft.SPOT.System.Targets @@ -382,12 +382,12 @@ - - - + + + - - + + diff --git a/tools/Targets/Microsoft.Spot.system.ds5.settings b/tools/Targets/Microsoft.Spot.system.ds5.settings new file mode 100644 index 000000000..ab5139fd0 --- /dev/null +++ b/tools/Targets/Microsoft.Spot.system.ds5.settings @@ -0,0 +1,32 @@ + + + + + + -- + + + + + + obj + lib + axf + xml + + $(SPO_BUILD)\$(INSTRUCTION_SET)\$(DOTNETMF_COMPILER)\$(ENDIANNESS)\ANY_MEDIA\$(OLD_FLAVOR) + $(SPO_BUILD)\$(INSTRUCTION_SET)\$(COMPILER_TOOL_VERSION)\$(ENDIANNESS)\$(TARGETLOCATION)\$(OLD_FLAVOR)\$(TARGETPLATFORM) + + + + + + + + + + + + + + diff --git a/tools/Targets/Microsoft.Spot.system.ds5.targets b/tools/Targets/Microsoft.Spot.system.ds5.targets new file mode 100644 index 000000000..ebb18126e --- /dev/null +++ b/tools/Targets/Microsoft.Spot.system.ds5.targets @@ -0,0 +1,384 @@ + + + + DS5 + {F7823E3C-8BCE-4D9A-AD56-9E06063C47CD} + + XScale;ARM7TDMI;ARM7TDMI-S;arm920t;arm926EJ-S;Cortex-M3;DARMAT;DARMATS9 + arm;thumb;thumb2;thumb2fp + + + + $(SPO_BUILD)\$(INSTRUCTION_SET)\$(TARGETLOCATION)\$(OLD_FLAVOR)\$(TARGETPLATFORM)\bin + $(SWTC)libpath "$(DS5_TOOL_PATH)\LIB" + + + "$(DS5_TOOL_PATH)\bin\armcc.exe" + "$(DS5_TOOL_PATH)\bin\armcc.exe" + "$(DS5_TOOL_PATH)\bin\armasm.exe" + "$(DS5_TOOL_PATH)\bin\armlink.exe" + "$(DS5_TOOL_PATH)\bin\armar.exe" + "$(DS5_TOOL_PATH)\bin\fromelf.exe" + $(MdkCrtLibLinkSwitch) $(SWTC)libpath "$(DS5_TOOL_PATH)\LIB" + + + + + + + + + + + $(AS_CC_CPP_COMMON_FLAGS) $(SWTC)arm + $(AS_CC_CPP_COMMON_FLAGS) $(SWTC)thumb + $(AS_CC_CPP_COMMON_FLAGS) $(SWTC)apcs=interwork + + $(CC_CPP_COMMON_FLAGS) -DMDK_V3_1 + $(CC_CPP_COMMON_FLAGS) -DARM_V3_1 + $(CC_CPP_COMMON_FLAGS) -DDS5_V5_05 + + $(CC_CPP_COMMON_FLAGS) $(SWTC)feedback $(SPO_SDK)\tools\make\Feedback\$(TARGETPLATFORM)_$(COMPILER_TOOL_VERSION).feedback + $(CC_CPP_COMMON_FLAGS) $(SWTC)feedback $(SPO_SDK)\tools\make\Feedback\$(TARGETPLATFORM)_$(COMPILER_TOOL_VERSION)_loader.feedback + + + + $(SWTC)asm $(SWTC)interleave + + $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)no_debug $(SWTC)dwarf2 $(SWTC)no_debug_macros -O3 $(SWTC)inline -Otime $(SWTC)no_autoinline $(CC_CPP_ASM_INTERLEAVE) + $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)debug $(SWTC)dwarf2 $(SWTC)debug_macros -O0 $(SWTC)inline $(CC_CPP_ASM_INTERLEAVE) + $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)debug $(SWTC)dwarf2 $(SWTC)debug_macros -O0 $(SWTC)inline $(CC_CPP_ASM_INTERLEAVE) + $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)no_debug $(SWTC)dwarf2 $(SWTC)no_debug_macros -O2 $(SWTC)inline -Otime $(SWTC)no_autoinline $(CC_CPP_ASM_INTERLEAVE) + + + $(AS_FLAGS) $(SWTC)diag_suppress A1658 + + $(CC_FLAGS) $(SWTC)c90 $(STRICT) $(SWTC)diag_suppress 2874,111,161,550,C3011,C4052,1295,223 $(SWTC)diag_warning 40,187 $(SWTC)split_sections + $(CPP_FLAGS) $(SWTC)cpp $(STRICT) $(SWTC)diag_suppress 2874,111,161,550,C3011,C4052 $(SWTC)diag_suppress 66,161,230,1293 $(SWTC)split_sections + $(LINK_FLAGS) $(SWTC)no_keep_init_arrays $(SWTC)feedback $(BIN_DIR)\$(AssemblyName)_$(TARGETPLATFORM)_$(TARGETLOCATION)_$(FLAVOR)_$(COMPILER_TOOL_VERSION).feedback + + + + + + + + + true + + + $(SWTC)cpu $(DEVICE_TYPE) + $(SWTC)device $(DEVICE_TYPE) + + + $(SWTC)fpu softvfp + $(SWTC)fpu none + + $(AS_CC_CPP_COMMON_FLAGS) $(FLOATING_POINT_FLAG) $(ARM_TYPE_FLAGS) + $(AS_CC_CPP_COMMON_FLAGS) $(SWTC)littleend + $(AS_CC_CPP_COMMON_FLAGS) $(SWTC)bigend + + + + + $(AS_TARGETTYPE_FLAGS) $(SWTC)PD "BUILD_RTM SETS \"1\"" + $(AS_TARGETTYPE_FLAGS) $(SWTC)PD "BUILD_RTM SETS \"0\"" + $(AS_TARGETTYPE_FLAGS) $(SWTC)PD "BUILD_RTM SETS \"0\"" -g + $(AS_TARGETTYPE_FLAGS) $(SWTC)PD "BUILD_RTM SETS \"0\"" -g + + + $(AS_FLAGS) $(SWTC)PD "PROFILE_BUILD SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "FIQ_SAMPLING_PROFILER SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "FIQ_LATENCY_PROFILER SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "COMPILE_ARM SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "COMPILE_THUMB SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "COMPILE_THUMB2 SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "COMPILE_THUMB2 SETS \"1\"" + + + $(AS_FLAGS) $(SWTC)PD "TargetLocation SETS \"$(TARGETLOCATION)\"" + + $(AS_FLAGS) $(SWTC)PD "TargetType SETS \"$(OLD_FLAVOR)\"" + $(AS_FLAGS) $(SWTC)PD "TargetModel SETS \"$(TARGETPLATFORM)\"" + $(AS_FLAGS) $(SWTC)PD "TargetPlatformName SETS \"PLATFORM_ARM_$(TARGETPLATFORM)\"" + $(AS_FLAGS) $(SWTC)PD "CompilerVersion SETS \"$(COMPILER_TOOL_VERSION)\"" + $(AS_FLAGS) $(SWTC)PD "TargetPlatformProcessor SETS \"PLATFORM_ARM_$(TARGETPROCESSOR)\"" + $(AS_FLAGS) $(SWTC)PD "HAL_REDUCESIZE SETS \"1\"" + $(AS_FLAGS) $(SWTC)PD "HAL_REDUCESIZE SETS \"0\"" + + $(AS_FLAGS) @(AS_Defines->'$(SWTC)PD %(filename) SETS \"1\"',' ') + + $(AS_FLAGS) $(AS_CC_CPP_COMMON_FLAGS) $(AS_TARGETTYPE_FLAGS) $(AS_INCS) -g $(SWTC)keep + + RVD_S + + + + + $(CC_CPP_TARGETTYPE_FLAGS) -DBUILD_RTM + $(CC_CPP_TARGETTYPE_FLAGS) -DDEBUG -D_DEBUG + $(CC_CPP_TARGETTYPE_FLAGS) -DDEBUG -D_DEBUG + $(CC_CPP_TARGETTYPE_FLAGS) -DNDEBUG + + $(CC_CPP_COMMON_FLAGS) -DTCPIP_LWIP + $(CC_CPP_COMMON_FLAGS) -DTCPIP_LWIP_OS + + $(CC_CPP_COMMON_FLAGS) -DHAL_REDUCESIZE + $(CC_CPP_COMMON_FLAGS) -DHAL_TIMEWARP + $(CC_CPP_COMMON_FLAGS) -DARM_PROFILE_ACTIVE + $(CC_CPP_COMMON_FLAGS) -DTINYCLR_ENABLE_SOURCELEVELDEBUGGING + $(CC_CPP_COMMON_FLAGS) -DTINYCLR_PROFILE_NEW -DTINYCLR_PROFILE_NEW_CALLS -DTINYCLR_PROFILE_NEW_ALLOCATIONS -DTINYCLR_PROFILE_HANDLER -DPROFILE_BUILD + $(CC_CPP_COMMON_FLAGS) -DFIQ_SAMPLING_PROFILER + $(CC_CPP_COMMON_FLAGS) -DFIQ_LATENCY_PROFILER + $(CC_CPP_COMMON_FLAGS) -DCOMPILE_ARM + $(CC_CPP_COMMON_FLAGS) -DCOMPILE_THUMB + $(CC_CPP_COMMON_FLAGS) -DCOMPILE_THUMB2 + $(CC_CPP_COMMON_FLAGS) -DCOMPILE_THUMB2 + + $(CC_CPP_COMMON_FLAGS) -DNATIVE_PROFILE_CLR=$(NATIVE_PROFILE_CLR) + $(CC_CPP_COMMON_FLAGS) -DNATIVE_PROFILE_PAL=$(NATIVE_PROFILE_PAL) + $(CC_CPP_COMMON_FLAGS) -DNATIVE_PROFILE_HAL=$(NATIVE_PROFILE_HAL) + + + $(CC_CPP_COMMON_FLAGS) -DVERSION_MAJOR=$(MajorVersion) -DVERSION_MINOR=$(MinorVersion) -DVERSION_BUILD=$(BuildNumber) -DVERSION_REVISION=$(RevisionNumber) -DOEMSYSTEMINFOSTRING="\"$(OemSystemInfoString)\"" + + $(CC_CPP_COMMON_FLAGS) -DPLATFORM_ARM_$(TARGETPLATFORM) + $(CC_CPP_COMMON_FLAGS) -DTARGETLOCATION_$(TARGETLOCATION) + $(CC_CPP_COMMON_FLAGS) -DLITTLE_ENDIAN + $(CC_CPP_COMMON_FLAGS) -DBIG_ENDIAN + $(CC_CPP_COMMON_FLAGS) -DPATCH_BUILD + $(CC_CPP_COMMON_FLAGS) -DPLATFORM_ARM_OS_PORT + + $(CC_CPP_COMMON_FLAGS) @(TinyCLR_Defines->'-D%(filename)',' ') + + $(CC_CPP_COMMON_FLAGS) @(CC_CPP_Defines->'-D%(filename)',' ') + + $(CC_CPP_INCS) -I$(CLRROOT)\$(Directory) + $(CC_CPP_INCS) -I$(SPO_SDK)\DeviceCode\include + $(CC_CPP_INCS) -I$(SPO_SDK)\DeviceCode\Cores\arm + $(CC_CPP_INCS) -I$(SPO_SDK)\Support\Include + $(CC_CPP_INCS) -I$(SPO_SDK)\crypto\inc + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Include + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\CorLib + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Hardware + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Graphics + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Net + $(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Net_Security + $(CC_CPP_INCS) @(IncludePaths->'-I$(CLRROOT)\%(relativedir)%(filename)',' ') + $(CC_CPP_INCS) @(DirectIncludePaths->'-I%(FullPath)',' ') + $(CC_CPP_INCS) -I"$(DS5_TOOL_PATH)\INCLUDE" + + + $(CC_CPP_COMMON_FLAGS) $(AS_CC_CPP_COMMON_FLAGS) $(CC_CPP_TARGETTYPE_FLAGS) $(CC_CPP_INCS) $(ExtraFlags) + + + + + $(CC_FLAGS) $(CC_CPP_COMMON_FLAGS) $(ExtraCCFlags) + + + + + + $(CPP_FLAGS) $(CC_CPP_COMMON_FLAGS) $(ExtraCPPFlags) + + + + + $(ARFLAGS) $(SWTC)create -c -r + + $(LINK_TARGETTYPE_FLAGS) $(SWTC)debug + $(LINK_FLAGS) $(LINK_TARGETTYPE_FLAGS) $(SWTC)remove $(SWTC)unmangled $(SWTC)info sizes,totals,veneers,unused,libraries $(SWTC)map $(SWTC)xref $(SWTC)symbols $(SWTC)callgraph + + $(LINK_FLAGS) $(SWTC)userlibpath $(LIB_DIR) $(SWTC)userlibpath "$(PLATFORM_INDEPENDENT_LIB_DIR)" $(MdkCrtLibLinkSwitch) $(ExtraLinkFlags) + + $(LINK_FLAGS) $(SWTC)entry EntryPoint $(ExtraLinkFlags) + + $(SWTC)scatter + + $(BIN_DIR)\$(AssemblyName) + + ArmBuildLib + BuildAXF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7cbf6a358035075ba85572b21ae0f17b768daba0 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 7 Aug 2015 05:23:33 +1200 Subject: [PATCH 2/3] Additional escaped quotes for copy actions. --- tools/Targets/Microsoft.Spot.system.ds5.targets | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/Targets/Microsoft.Spot.system.ds5.targets b/tools/Targets/Microsoft.Spot.system.ds5.targets index ebb18126e..6b91abfa0 100644 --- a/tools/Targets/Microsoft.Spot.system.ds5.targets +++ b/tools/Targets/Microsoft.Spot.system.ds5.targets @@ -48,8 +48,6 @@ $(SWTC)asm $(SWTC)interleave $(SWTC)asm $(SWTC)interleave --> - - $(SWTC)asm $(SWTC)interleave $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)no_debug $(SWTC)dwarf2 $(SWTC)no_debug_macros -O3 $(SWTC)inline -Otime $(SWTC)no_autoinline $(CC_CPP_ASM_INTERLEAVE) $(CC_CPP_TARGETTYPE_FLAGS) $(SWTC)debug $(SWTC)dwarf2 $(SWTC)debug_macros -O0 $(SWTC)inline $(CC_CPP_ASM_INTERLEAVE) @@ -283,8 +281,8 @@ - - + + @@ -370,13 +368,13 @@ - + - + From 7a690fd22df784cbbca5b41dfe02081c149d29f3 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 7 Aug 2015 12:16:39 +1200 Subject: [PATCH 3/3] Local files to ignore. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 40803f7db..21ac639e8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,10 @@ Listings/ /DeviceCode/Targets/OS/Win32/DeviceCode/WinPcap_Eth/Dependencies/WpdPack/ *.axfdump +/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/OnBoardFlash.dat +/Test/Platform/Tests/CLR/Microsoft.SPOT.TinyCore/Presentation/OnBoardFlash.dat.smd +/Test/Platform/Tools/MFTestSystem/Results +/devenvdebug.cmd +/setenv.cmd +/setenv_base_classic.cmd +/setenv_rvds.cmd