Update CMSIS 4.3.0 (it now includes RTX)

nealjack · Jun 27, 2015 · 98be9ff · 98be9ff
1 parent abb6a64
commit 98be9ff
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,10 +7,9 @@
 
 # CMSIS and CMSIS_RTX
 /CMSIS/CMSIS/
-/CMSIS/CMSIS_RTX/*
 /CMSIS/Device/*
 /CMSIS/ARM.CMSIS.pdsc
-!/CMSIS/CMSIS_RTX/dotNetMF.proj
+!/CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj
 
 # Visual Studio
 *.aps

diff --git a/CMSIS/CMSIS-SP-00300-r4p2-00rel0.txt b/CMSIS/CMSIS-SP-00300-r4p2-00rel0.txt
diff --git a/CMSIS/CMSIS_RTX/dotNetMF.proj → CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj b/CMSIS/CMSIS_RTX/dotNetMF.proj → CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj
@@ -8,7 +8,7 @@
         <Description>CMSIS-RTX OS</Description>
         <Level>HAL</Level>
         <LibraryFile>CMSIS_RTX.$(LIB_EXT)</LibraryFile>
-        <ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotNetMF.proj</ProjectPath>
+        <ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotNetMF.proj</ProjectPath>
         <ManifestFile>CMSIS_RTX.$(LIB_EXT).manifest</ManifestFile>
         <Groups>OS\CMSIS_RTOS</Groups>
         <LibraryCategory>
@@ -31,8 +31,8 @@
     </PropertyGroup>
     <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
     <ItemGroup>
-        <IncludePaths Include="CMSIS\CMSIS_RTX\INC" />
-        <IncludePaths Include="CMSIS\CMSIS_RTX\SRC" />
+        <IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\INC" />
+        <IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\SRC" />
         <IncludePaths Include="CMSIS\CMSIS\Include" />
         <IncludePaths Include="CMSIS\CMSIS\Driver\Include" />
     </ItemGroup>

diff --git a/CMSIS/ReadMe.md b/CMSIS/ReadMe.md
@@ -2,6 +2,6 @@
 This folder is a placeholder for the CMSIS source code installation. CMSIS is available from ARM on
 the [ARM web site](http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php)
 
-CMSIS comes as a ZIP file, **_the version this code base is validated and tested with is v4.2 (CMSIS-SP-00300-r4p2-00rel0.zip)_**
+CMSIS comes as a ZIP file, **_the version this code base is validated and tested with is v4.3 (CMSIS-SP-00300-r4p3-00rel0.zip)_**
 Extract the contents of the zip file into the same directory as this readme.md file. The build system will look for the 
 CMSIS support files here.
diff --git a/Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj b/Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj
@@ -426,7 +426,7 @@
         <RequiredProjects Include="$(SPOCLIENT)\CLR\libraries\spot_net\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
-        <RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotnetmf.proj" />
+        <RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotnetmf.proj" />
         <DriverLibs Include="CMSIS_RTX.$(LIB_EXT)" />
     </ItemGroup>
     <ItemGroup>