diff --git a/.gitignore b/.gitignore index 5fac61781..40803f7db 100644 --- 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 deleted file mode 100644 index 203822da7..000000000 --- a/CMSIS/CMSIS-SP-00300-r4p2-00rel0.txt +++ /dev/null @@ -1,2 +0,0 @@ -The CMSIS version this code is based on is: -CMSIS-SP-00300-r4p2-00rel0 \ No newline at end of file diff --git a/CMSIS/CMSIS_RTX/dotNetMF.proj b/CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj similarity index 93% rename from CMSIS/CMSIS_RTX/dotNetMF.proj rename to CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj index e34df39e8..7c644eb25 100644 --- a/CMSIS/CMSIS_RTX/dotNetMF.proj +++ b/CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj @@ -8,7 +8,7 @@ CMSIS-RTX OS HAL CMSIS_RTX.$(LIB_EXT) - $(SPOCLIENT)\CMSIS\CMSIS_RTX\dotNetMF.proj + $(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotNetMF.proj CMSIS_RTX.$(LIB_EXT).manifest OS\CMSIS_RTOS @@ -31,8 +31,8 @@ - - + + diff --git a/CMSIS/ReadMe.md b/CMSIS/ReadMe.md index ef6ec6684..d712fb476 100644 --- 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 index 235dc5aeb..8bdeb8e97 100644 --- a/Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj +++ b/Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj @@ -426,7 +426,7 @@ - +