Merge pull request #189 from fpoussin/rename

ChibiOS Path rename

84 files changed, 102 insertions, 92 deletions

diff --git a/README.md b/README.md
index d0ed018..6414aa5 100644
--- a/README.md
+++ b/README.md
@@ -4,25 +4,35 @@ Code under this directory is not part of the core ChibiOS project
 and the copyright is retained by the original authors. See copyright
 notes in file headers.
 
-Code is maintained via Github https://github.com/ChibiOS/ChibiOS-Contrib
-Feel free to send pull request there.
+Code is maintained via Github: https://github.com/ChibiOS/ChibiOS-Contrib  
+Feel free to open pull request there.
 
 #### Using
 
-```bash
-# git clone git@github.com:Chibios/ChibiOS.git ChibiOS-RT
-# git clone git@github.com:ChibiOS/ChibiOS-Contrib.git ChibiOS-Contrib
+Default makefiles assume this repo will be cloned in the same folder as ChibiOS.  
+If you use another location, you will have to edit the Makefile, or specify an alternate location to make, ie:  
+
+```
+cd ChibiOS-Contrib/testhal/STM32/STM32F3xx/TIMCAP
+make CHIBIOS=~/src/ChibiOS
+```
+
+A good way to use it is to clone it as a submodule inside your project:  
+
+```
+git submodule add https://github.com/ChibiOS/ChibiOS.git
+git submodule add https://github.com/ChibiOS/ChibiOS-Contrib.git
 ```
-Note: this repos cloned in the same directory side by side (not inside).
 
 #### Contributing
 
-When you submit a pull request, make sure all impacted platform tests compile using the tools/build.sh script.  
+When you submit a pull request, make sure all modified platform tests compile using the tools/build.sh script.  
+There is an automated check that will report errors if it doesn't.  
 Feel free to update authors.txt with your name.  
 
-
 #### Useful links
 
 https://help.github.com/  
 http://git-scm.com/  
-http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide
+http://chibios.org/dokuwiki/doku.php?id=chibios:guides:style_guide  
+http://www.chibios.com/forum/  
diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
index 7d2224c..f714eaf 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M-EXT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile b/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
index 7d2224c..f714eaf 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
index 7616baa..c5ff9c9 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-EXT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
index 6a17c8b..af43f2e 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z-SHELL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile b/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
index 7616baa..c5ff9c9 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
index 58ebbb3..56680f8 100644
--- a/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
+++ b/demos/KINETIS/RT-MCHCK-K20-GPT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
index 58ebbb3..56680f8 100644
--- a/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
+++ b/demos/KINETIS/RT-MCHCK-K20-SPI/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/KINETIS/RT-TEENSY3/Makefile b/demos/KINETIS/RT-TEENSY3/Makefile
index 65aec1a..21a6ba1 100644
--- a/demos/KINETIS/RT-TEENSY3/Makefile
+++ b/demos/KINETIS/RT-TEENSY3/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../ChibiOS-RT
+CHIBIOS = ../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/demos/MSP430X/NIL-EXP430FR5969/Makefile b/demos/MSP430X/NIL-EXP430FR5969/Makefile
index f9a9627..c54f4fe 100644
--- a/demos/MSP430X/NIL-EXP430FR5969/Makefile
+++ b/demos/MSP430X/NIL-EXP430FR5969/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/demos/MSP430X/NIL-EXP430FR6989/Makefile b/demos/MSP430X/NIL-EXP430FR6989/Makefile
index fce3946..cfe5911 100644
--- a/demos/MSP430X/NIL-EXP430FR6989/Makefile
+++ b/demos/MSP430X/NIL-EXP430FR6989/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/demos/NRF51/MICROBIT/Makefile b/demos/NRF51/MICROBIT/Makefile
index aa516e0..dcf2705 100644
--- a/demos/NRF51/MICROBIT/Makefile
+++ b/demos/NRF51/MICROBIT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/NRF51/OSHCHIP_V1.0/Makefile b/demos/NRF51/OSHCHIP_V1.0/Makefile
index 27255b8..554a7da 100644
--- a/demos/NRF51/OSHCHIP_V1.0/Makefile
+++ b/demos/NRF51/OSHCHIP_V1.0/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/NRF51/RT-WVSHARE_BLE400/Makefile b/demos/NRF51/RT-WVSHARE_BLE400/Makefile
index 29949a5..3da8b88 100644
--- a/demos/NRF51/RT-WVSHARE_BLE400/Makefile
+++ b/demos/NRF51/RT-WVSHARE_BLE400/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/NRF52/Classic/Makefile b/demos/NRF52/Classic/Makefile
index 8742dd3..5cfc011 100644
--- a/demos/NRF52/Classic/Makefile
+++ b/demos/NRF52/Classic/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS         = ../../../../ChibiOS-RT

+CHIBIOS         = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
index 738a956..fbaae10 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
+++ b/demos/STM32/RT-STM32F303-DISCOVERY-PID/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
index aa99ec7..4a1d1ea 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
index ead8513..5d1e52f 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
index 104f62e..a2f0b7a 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../ChibiOS-RT
+CHIBIOS = ../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
index 4584bdf..232b38d 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../ChibiOS-RT
+CHIBIOS = ../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
index 11f28f6..2fca345 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../ChibiOS-RT
+CHIBIOS = ../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/demos/various/RT-Win32-TriBuf/Makefile b/demos/various/RT-Win32-TriBuf/Makefile
index a50f45a..c15feec 100644
--- a/demos/various/RT-Win32-TriBuf/Makefile
+++ b/demos/various/RT-Win32-TriBuf/Makefile
@@ -56,7 +56,7 @@ UDEFS =
 UADEFS =

 

 # Imported source files

-CHIBIOS = ../../../../ChibiOS-RT

+CHIBIOS = ../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 include $(CHIBIOS)/os/hal/boards/simulator/board.mk

 include $(CHIBIOS)/os/hal/hal.mk

diff --git a/testhal/KINETIS/FRDM-K20D50M/I2C/Makefile b/testhal/KINETIS/FRDM-K20D50M/I2C/Makefile
index e2ad0c8..cb528f9 100644
--- a/testhal/KINETIS/FRDM-K20D50M/I2C/Makefile
+++ b/testhal/KINETIS/FRDM-K20D50M/I2C/Makefile
@@ -87,7 +87,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/Makefile
index 1f34aba..4b2ede6 100644
--- a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/FRDM-KL25Z/ADC/Makefile b/testhal/KINETIS/FRDM-KL25Z/ADC/Makefile
index 0a813ec..b5150d5 100644
--- a/testhal/KINETIS/FRDM-KL25Z/ADC/Makefile
+++ b/testhal/KINETIS/FRDM-KL25Z/ADC/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL25Z/GPT/Makefile b/testhal/KINETIS/FRDM-KL25Z/GPT/Makefile
index 0a813ec..b5150d5 100644
--- a/testhal/KINETIS/FRDM-KL25Z/GPT/Makefile
+++ b/testhal/KINETIS/FRDM-KL25Z/GPT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL25Z/PWM/Makefile b/testhal/KINETIS/FRDM-KL25Z/PWM/Makefile
index 0a813ec..b5150d5 100644
--- a/testhal/KINETIS/FRDM-KL25Z/PWM/Makefile
+++ b/testhal/KINETIS/FRDM-KL25Z/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_HID/Makefile b/testhal/KINETIS/FRDM-KL25Z/USB_HID/Makefile
index 3c25877..3d4844d 100644
--- a/testhal/KINETIS/FRDM-KL25Z/USB_HID/Makefile
+++ b/testhal/KINETIS/FRDM-KL25Z/USB_HID/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile
index 0eab704..038f796 100644
--- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL26Z/I2C/Makefile b/testhal/KINETIS/FRDM-KL26Z/I2C/Makefile
index 7ce4956..713d772 100644
--- a/testhal/KINETIS/FRDM-KL26Z/I2C/Makefile
+++ b/testhal/KINETIS/FRDM-KL26Z/I2C/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL26Z/PWM/Makefile b/testhal/KINETIS/FRDM-KL26Z/PWM/Makefile
index 7ce4956..713d772 100644
--- a/testhal/KINETIS/FRDM-KL26Z/PWM/Makefile
+++ b/testhal/KINETIS/FRDM-KL26Z/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
index b71d3b1..7327b35 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/KL27Z/BLINK/Makefile b/testhal/KINETIS/KL27Z/BLINK/Makefile
index cd6424e..8348654 100644
--- a/testhal/KINETIS/KL27Z/BLINK/Makefile
+++ b/testhal/KINETIS/KL27Z/BLINK/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/MCHCK/BOOTLOADER/Makefile b/testhal/KINETIS/MCHCK/BOOTLOADER/Makefile
index 8ff8acd..c2fa3a0 100644
--- a/testhal/KINETIS/MCHCK/BOOTLOADER/Makefile
+++ b/testhal/KINETIS/MCHCK/BOOTLOADER/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/MCHCK/PWM/Makefile b/testhal/KINETIS/MCHCK/PWM/Makefile
index 8ff8acd..c2fa3a0 100644
--- a/testhal/KINETIS/MCHCK/PWM/Makefile
+++ b/testhal/KINETIS/MCHCK/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile
index cc51364..31862bd 100644
--- a/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/MCHCK/USB_SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/KINETIS/TEENSY3_x/ADC/Makefile b/testhal/KINETIS/TEENSY3_x/ADC/Makefile
index d12b346..eee81be 100644
--- a/testhal/KINETIS/TEENSY3_x/ADC/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/ADC/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/EEPROM_EMU/Makefile b/testhal/KINETIS/TEENSY3_x/EEPROM_EMU/Makefile
index 1733c56..626a52f 100644
--- a/testhal/KINETIS/TEENSY3_x/EEPROM_EMU/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/EEPROM_EMU/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/EXT/Makefile b/testhal/KINETIS/TEENSY3_x/EXT/Makefile
index d12b346..eee81be 100644
--- a/testhal/KINETIS/TEENSY3_x/EXT/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/EXT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/GPT/Makefile b/testhal/KINETIS/TEENSY3_x/GPT/Makefile
index d12b346..eee81be 100644
--- a/testhal/KINETIS/TEENSY3_x/GPT/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/GPT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/PWM/Makefile b/testhal/KINETIS/TEENSY3_x/PWM/Makefile
index d12b346..eee81be 100644
--- a/testhal/KINETIS/TEENSY3_x/PWM/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/SERIAL/Makefile b/testhal/KINETIS/TEENSY3_x/SERIAL/Makefile
index d12b346..eee81be 100644
--- a/testhal/KINETIS/TEENSY3_x/SERIAL/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile
index 0cd1dbc..4273fc6 100644
--- a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile
+++ b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile b/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
index 71438e9..ba07396 100644
--- a/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
+++ b/testhal/KINETIS/TEENSY_LC/BOOTLOADER/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY_LC/EEPROM_EMU/Makefile b/testhal/KINETIS/TEENSY_LC/EEPROM_EMU/Makefile
index 812efc4..79b377a 100644
--- a/testhal/KINETIS/TEENSY_LC/EEPROM_EMU/Makefile
+++ b/testhal/KINETIS/TEENSY_LC/EEPROM_EMU/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/KINETIS/TEENSY_LC/PWM/Makefile b/testhal/KINETIS/TEENSY_LC/PWM/Makefile
index 71438e9..ba07396 100644
--- a/testhal/KINETIS/TEENSY_LC/PWM/Makefile
+++ b/testhal/KINETIS/TEENSY_LC/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/MSP430X/EXP430FR5969/ADC/Makefile b/testhal/MSP430X/EXP430FR5969/ADC/Makefile
index 89c32e0..0169cb1 100644
--- a/testhal/MSP430X/EXP430FR5969/ADC/Makefile
+++ b/testhal/MSP430X/EXP430FR5969/ADC/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/testhal/MSP430X/EXP430FR5969/DMA/Makefile b/testhal/MSP430X/EXP430FR5969/DMA/Makefile
index cf81f18..5fe3473 100644
--- a/testhal/MSP430X/EXP430FR5969/DMA/Makefile
+++ b/testhal/MSP430X/EXP430FR5969/DMA/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/testhal/MSP430X/EXP430FR5969/SPI/Makefile b/testhal/MSP430X/EXP430FR5969/SPI/Makefile
index cf81f18..5fe3473 100644
--- a/testhal/MSP430X/EXP430FR5969/SPI/Makefile
+++ b/testhal/MSP430X/EXP430FR5969/SPI/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/testhal/MSP430X/EXP430FR6989/ADC/Makefile b/testhal/MSP430X/EXP430FR6989/ADC/Makefile
index b86021e..e79020d 100644
--- a/testhal/MSP430X/EXP430FR6989/ADC/Makefile
+++ b/testhal/MSP430X/EXP430FR6989/ADC/Makefile
@@ -100,7 +100,7 @@ endif
 PROJECT = nil

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = ../../../..

 # Startup files.

 include $(CHIBIOS_CONTRIB)/os/common/startup/MSP430X/compilers/GCC/mk/startup_msp430fr5xxx.mk

diff --git a/testhal/NRF51/NRF51822/ADC/Makefile b/testhal/NRF51/NRF51822/ADC/Makefile
index ee5667b..8ee59f9 100644
--- a/testhal/NRF51/NRF51822/ADC/Makefile
+++ b/testhal/NRF51/NRF51822/ADC/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF51/NRF51822/EXT/Makefile b/testhal/NRF51/NRF51822/EXT/Makefile
index 9cdc41d..79e226d 100644
--- a/testhal/NRF51/NRF51822/EXT/Makefile
+++ b/testhal/NRF51/NRF51822/EXT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF51/NRF51822/GPT/Makefile b/testhal/NRF51/NRF51822/GPT/Makefile
index ee5667b..8ee59f9 100644
--- a/testhal/NRF51/NRF51822/GPT/Makefile
+++ b/testhal/NRF51/NRF51822/GPT/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF51/NRF51822/I2C/Makefile b/testhal/NRF51/NRF51822/I2C/Makefile
index 784ba49..ce37f2f 100644
--- a/testhal/NRF51/NRF51822/I2C/Makefile
+++ b/testhal/NRF51/NRF51822/I2C/Makefile
@@ -80,7 +80,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF51/NRF51822/PWM/Makefile b/testhal/NRF51/NRF51822/PWM/Makefile
index cc7bc1b..1924cfb 100644
--- a/testhal/NRF51/NRF51822/PWM/Makefile
+++ b/testhal/NRF51/NRF51822/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 

 # Startup files.

diff --git a/testhal/NRF51/NRF51822/RNG/Makefile b/testhal/NRF51/NRF51822/RNG/Makefile
index 9520152..4a71207 100644
--- a/testhal/NRF51/NRF51822/RNG/Makefile
+++ b/testhal/NRF51/NRF51822/RNG/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 

 # Startup files.

diff --git a/testhal/NRF51/NRF51822/SPI/Makefile b/testhal/NRF51/NRF51822/SPI/Makefile
index e0fa91b..fa799b9 100644
--- a/testhal/NRF51/NRF51822/SPI/Makefile
+++ b/testhal/NRF51/NRF51822/SPI/Makefile
@@ -80,7 +80,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF51/NRF51822/WDG/Makefile b/testhal/NRF51/NRF51822/WDG/Makefile
index c096d27..8cadfce 100644
--- a/testhal/NRF51/NRF51822/WDG/Makefile
+++ b/testhal/NRF51/NRF51822/WDG/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF52/NRF52832/I2C/Makefile b/testhal/NRF52/NRF52832/I2C/Makefile
index e5061f7..edb407e 100644
--- a/testhal/NRF52/NRF52832/I2C/Makefile
+++ b/testhal/NRF52/NRF52832/I2C/Makefile
@@ -80,7 +80,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/NRF52/NRF52832/PWM-ICU/Makefile b/testhal/NRF52/NRF52832/PWM-ICU/Makefile
index 6cc0a38..237bcbe 100644
--- a/testhal/NRF52/NRF52832/PWM-ICU/Makefile
+++ b/testhal/NRF52/NRF52832/PWM-ICU/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 

 # Startup files.

diff --git a/testhal/NRF52/NRF52832/RADIO-ESB/Makefile b/testhal/NRF52/NRF52832/RADIO-ESB/Makefile
index 481f911..a01eb88 100644
--- a/testhal/NRF52/NRF52832/RADIO-ESB/Makefile
+++ b/testhal/NRF52/NRF52832/RADIO-ESB/Makefile
@@ -80,7 +80,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/STM32/STM32F0xx/crc/Makefile b/testhal/STM32/STM32F0xx/crc/Makefile
index 6721d80..0c36874 100644
--- a/testhal/STM32/STM32F0xx/crc/Makefile
+++ b/testhal/STM32/STM32F0xx/crc/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index c863257..c598f7f 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Licensing files.
diff --git a/testhal/STM32/STM32F0xx/qei/Makefile b/testhal/STM32/STM32F0xx/qei/Makefile
index 0e8d92f..3fd75c3 100644
--- a/testhal/STM32/STM32F0xx/qei/Makefile
+++ b/testhal/STM32/STM32F0xx/qei/Makefile
@@ -81,7 +81,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F1xx/onewire/Makefile b/testhal/STM32/STM32F1xx/onewire/Makefile
index 91052f8..4d217ed 100644
--- a/testhal/STM32/STM32F1xx/onewire/Makefile
+++ b/testhal/STM32/STM32F1xx/onewire/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Licensing files.
diff --git a/testhal/STM32/STM32F1xx/qei/Makefile b/testhal/STM32/STM32F1xx/qei/Makefile
index 5f16036..ff058da 100644
--- a/testhal/STM32/STM32F1xx/qei/Makefile
+++ b/testhal/STM32/STM32F1xx/qei/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F3xx/COMP/Makefile b/testhal/STM32/STM32F3xx/COMP/Makefile
index 3730513..e2dac00 100644
--- a/testhal/STM32/STM32F3xx/COMP/Makefile
+++ b/testhal/STM32/STM32F3xx/COMP/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/STM32/STM32F3xx/EEProm/Makefile b/testhal/STM32/STM32F3xx/EEProm/Makefile
index 3730513..e2dac00 100644
--- a/testhal/STM32/STM32F3xx/EEProm/Makefile
+++ b/testhal/STM32/STM32F3xx/EEProm/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/STM32/STM32F3xx/OPAMP/Makefile b/testhal/STM32/STM32F3xx/OPAMP/Makefile
index 3730513..e2dac00 100644
--- a/testhal/STM32/STM32F3xx/OPAMP/Makefile
+++ b/testhal/STM32/STM32F3xx/OPAMP/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/STM32/STM32F3xx/TIMCAP/Makefile b/testhal/STM32/STM32F3xx/TIMCAP/Makefile
index 8c6490e..418518d 100644
--- a/testhal/STM32/STM32F3xx/TIMCAP/Makefile
+++ b/testhal/STM32/STM32F3xx/TIMCAP/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F4xx/EICU/Makefile b/testhal/STM32/STM32F4xx/EICU/Makefile
index d458565..b7a0ff1 100644
--- a/testhal/STM32/STM32F4xx/EICU/Makefile
+++ b/testhal/STM32/STM32F4xx/EICU/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
index 2c622eb..d4b6572 100644
--- a/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_NAND/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
index b575f08..8e1b5e4 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
index a60eef9..d0d1670 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
+++ b/testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index bf0d11a..f518c5f 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT

+CHIBIOS = ../../../../../ChibiOS

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 # Licensing files.

 include $(CHIBIOS)/os/license/license.mk

diff --git a/testhal/STM32/STM32F4xx/onewire/Makefile b/testhal/STM32/STM32F4xx/onewire/Makefile
index 0e13de2..404ee71 100644
--- a/testhal/STM32/STM32F4xx/onewire/Makefile
+++ b/testhal/STM32/STM32F4xx/onewire/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
 # Licensing files.
diff --git a/testhal/STM32/STM32F7xx/USB_MSD/Makefile b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
index 30d9bec..870ed6e 100644
--- a/testhal/STM32/STM32F7xx/USB_MSD/Makefile
+++ b/testhal/STM32/STM32F7xx/USB_MSD/Makefile
@@ -91,7 +91,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
diff --git a/testhal/TIVA/TM4C123x/ADC/Makefile b/testhal/TIVA/TM4C123x/ADC/Makefile
index f098dc2..bd998ad 100644
--- a/testhal/TIVA/TM4C123x/ADC/Makefile
+++ b/testhal/TIVA/TM4C123x/ADC/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/GPT/Makefile b/testhal/TIVA/TM4C123x/GPT/Makefile
index 00661de..490c89d 100644
--- a/testhal/TIVA/TM4C123x/GPT/Makefile
+++ b/testhal/TIVA/TM4C123x/GPT/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/I2C/Makefile b/testhal/TIVA/TM4C123x/I2C/Makefile
index f098dc2..bd998ad 100644
--- a/testhal/TIVA/TM4C123x/I2C/Makefile
+++ b/testhal/TIVA/TM4C123x/I2C/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/PWM/Makefile b/testhal/TIVA/TM4C123x/PWM/Makefile
index 00661de..490c89d 100644
--- a/testhal/TIVA/TM4C123x/PWM/Makefile
+++ b/testhal/TIVA/TM4C123x/PWM/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/SPI/Makefile b/testhal/TIVA/TM4C123x/SPI/Makefile
index 00661de..490c89d 100644
--- a/testhal/TIVA/TM4C123x/SPI/Makefile
+++ b/testhal/TIVA/TM4C123x/SPI/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/UART/Makefile b/testhal/TIVA/TM4C123x/UART/Makefile
index 00661de..490c89d 100644
--- a/testhal/TIVA/TM4C123x/UART/Makefile
+++ b/testhal/TIVA/TM4C123x/UART/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.
diff --git a/testhal/TIVA/TM4C123x/WDG/Makefile b/testhal/TIVA/TM4C123x/WDG/Makefile
index 00661de..490c89d 100644
--- a/testhal/TIVA/TM4C123x/WDG/Makefile
+++ b/testhal/TIVA/TM4C123x/WDG/Makefile
@@ -86,7 +86,7 @@ endif
 PROJECT = ch
 
 # Imported source files and paths
-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 
 # Licensing files.