Merge branch 'master' into fix-nrf51-port

98 files changed, 881 insertions, 475 deletions

diff --git a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c
index 9a2ca0e..558e7ad 100644
--- a/demos/KINETIS/RT-FREEDOM-K20D50M/main.c
+++ b/demos/KINETIS/RT-FREEDOM-K20D50M/main.c
@@ -16,7 +16,7 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

+#include "ch_test.h"

 

 static THD_WORKING_AREA(waThread1, 64);

 static THD_FUNCTION(Thread1, arg) {

@@ -78,7 +78,7 @@ int main(void) {
   chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL);

   chThdCreateStatic(waThread3, sizeof(waThread3), NORMALPRIO, Thread3, NULL);

 

-  TestThread(&SD1);

+  test_execute((BaseSequentialStream *)&SD1);

   while (1) {

     chThdSleepMilliseconds(500);

   }

diff --git a/demos/KINETIS/RT-FREEDOM-KL25Z/main.c b/demos/KINETIS/RT-FREEDOM-KL25Z/main.c
index d565ca0..479356c 100644
--- a/demos/KINETIS/RT-FREEDOM-KL25Z/main.c
+++ b/demos/KINETIS/RT-FREEDOM-KL25Z/main.c
@@ -16,7 +16,7 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

+#include "ch_test.h"

 

 static THD_WORKING_AREA(waThread1, 64);

 static THD_FUNCTION(Thread1, arg) {

@@ -78,7 +78,7 @@ int main(void) {
   chThdCreateStatic(waThread2, sizeof(waThread2), NORMALPRIO, Thread2, NULL);

   chThdCreateStatic(waThread3, sizeof(waThread3), NORMALPRIO, Thread3, NULL);

 

-  TestThread(&SD1);

+  test_execute((BaseSequentialStream *)&SD1);

   while (1) {

     chThdSleepMilliseconds(500);

   }

diff --git a/demos/KINETIS/RT-TEENSY3/main.c b/demos/KINETIS/RT-TEENSY3/main.c
index ebeb637..42d6510 100644
--- a/demos/KINETIS/RT-TEENSY3/main.c
+++ b/demos/KINETIS/RT-TEENSY3/main.c
@@ -16,7 +16,7 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

+#include "ch_test.h"

 

 /*

  * LED blinker thread.

@@ -57,7 +57,7 @@ int main(void) {
    */

   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);

 

-  TestThread(&SD1);

+  test_execute((BaseSequentialStream *)&SD1);

   while (true) {

       chThdSleepMilliseconds(1000);

   }

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
index 47560db..92a608c 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
 
@@ -207,5 +207,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
index 25b16cc..5e7c63d 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
index 0a64adb..29a1b20 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "test.h"
+#include "ch_test.h"
 
 typedef struct led_config
 {
@@ -31,8 +31,7 @@ typedef struct led_config
 static THD_WORKING_AREA(waBlinkLedRed, 128);
 static THD_WORKING_AREA(waBlinkLedGreen, 128);
 static THD_WORKING_AREA(waBlinkLedBlue, 128);
-static msg_t blinkLed(void *arg)
-{
+static THD_FUNCTION(blinkLed, arg) {
   led_config_t *ledConfig = (led_config_t*) arg;
 
   chRegSetThreadName("Blinker");
@@ -43,8 +42,6 @@ static msg_t blinkLed(void *arg)
     chThdSleepMilliseconds(ledConfig->sleep);
     palTogglePad(ledConfig->port, ledConfig->pin);
   }
-
-  return (msg_t) 0;
 }
 
 /*
@@ -72,7 +69,7 @@ int main(void)
   sdStart(&SD1, NULL);
 
   if (!palReadPad(GPIOF, GPIOF_SW2)) {
-    TestThread(&SD1);
+    test_execute((BaseSequentialStream *)&SD1);
   }
 
   ledRed.port    = GPIOF;
@@ -101,6 +98,6 @@ int main(void)
   while (TRUE) {
     chThdSleepMilliseconds(100);
   }
-  
+
   return 0;
 }
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
index f69722b..8d96b75 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
 
@@ -210,5 +210,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
index ad50207..e0be810 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
index dfc9d0d..d3d74df 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.c
@@ -87,7 +87,7 @@ THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
 /**
  * HTTP server thread.
  */
-msg_t http_server(void *p) {
+THD_FUNCTION(http_server, p) {
   struct netconn *conn, *newconn;
   err_t err;
 
@@ -95,7 +95,7 @@ msg_t http_server(void *p) {
 
   /* Create a new TCP connection handle */
   conn = netconn_new(NETCONN_TCP);
-  LWIP_ERROR("http_server: invalid conn", (conn != NULL), return MSG_RESET;);
+  LWIP_ERROR("http_server: invalid conn", (conn != NULL), return;);
 
   /* Bind to port 80 (HTTP) with default IP address */
   netconn_bind(conn, NULL, WEB_THREAD_PORT);
@@ -113,7 +113,6 @@ msg_t http_server(void *p) {
     http_server_serve(newconn);
     netconn_delete(newconn);
   }
-  return MSG_OK;
 }
 
 #endif /* LWIP_NETCONN */
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
index 2764242..ed0fffd 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/web/web.h
@@ -41,7 +41,7 @@ extern THD_WORKING_AREA(wa_http_server, WEB_THREAD_STACK_SIZE);
 #ifdef __cplusplus
 extern "C" {
 #endif
-  msg_t http_server(void *p);
+  THD_FUNCTION(http_server, p);
 #ifdef __cplusplus
 }
 #endif
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
index 08aace6..344d3e8 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C1294_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/test/rt/test.mk
 
@@ -151,7 +151,6 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
 
 MCU  = cortex-m4
 
-#TRGT = arm-elf-
 TRGT = arm-none-eabi-
 CC   = $(TRGT)gcc
 CPPC = $(TRGT)g++
@@ -207,5 +206,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
index aac875a..e99b5b3 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
index bb2b0e3..adb915e 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
@@ -16,7 +16,7 @@
 
 #include "ch.h"
 #include "hal.h"
-#include "test.h"
+#include "ch_test.h"
 
 typedef struct led_config
 {
@@ -32,8 +32,7 @@ static THD_WORKING_AREA(waBlinkLed1, 128);
 static THD_WORKING_AREA(waBlinkLed2, 128);
 static THD_WORKING_AREA(waBlinkLed3, 128);
 static THD_WORKING_AREA(waBlinkLed4, 128);
-static msg_t blinkLed(void *arg)
-{
+static THD_FUNCTION(blinkLed, arg) {
   led_config_t *ledConfig = (led_config_t*) arg;
 
   chRegSetThreadName("Blinker");
@@ -45,8 +44,6 @@ static msg_t blinkLed(void *arg)
     chThdSleepMilliseconds(ledConfig->sleep);
     palTogglePad(ledConfig->port, ledConfig->pin);
   }
-
-  return (msg_t) 0;
 }
 
 /*
@@ -74,7 +71,7 @@ int main(void)
   sdStart(&SD1, NULL);
 
   if (!palReadPad(GPIOJ, GPIOJ_SW1)) {
-    TestThread(&SD1);
+    test_execute((BaseSequentialStream *)&SD1);
   }
 
   led1.port  = GPIOF;
@@ -112,6 +109,6 @@ int main(void)
   while (TRUE) {
     chThdSleepMilliseconds(100);
   }
-  
+
   return 0;
 }
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld
deleted file mode 100644
index 8f676a0..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C123xC3 memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 32k
-  ram0  : org = 0x20000000, len = 12k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld
deleted file mode 100644
index 1968cd0..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C123xD5 memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 64k
-  ram0  : org = 0x20000000, len = 24k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld
deleted file mode 100644
index 7b12b53..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C123xE6 memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 128k
-  ram0  : org = 0x20000000, len = 32k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld
deleted file mode 100644
index 5c049b9..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C123xH6 memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 256k
-  ram0  : org = 0x20000000, len = 32k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld
deleted file mode 100644
index 0f3fef1..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C129xKC memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 512k
-  ram0  : org = 0x20000000, len = 256k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld b/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld
deleted file mode 100644
index fd23266..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-    Copyright (C) 2014 Marco Veeneman
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * TM4C123xH6 memory setup.
- */
-MEMORY
-{
-  flash : org = 0x00000000, len = 1M
-  ram0  : org = 0x20000000, len = 256k
-  ram1  : org = 0x00000000, len = 0
-  ram2  : org = 0x00000000, len = 0
-  ram3  : org = 0x00000000, len = 0
-  ram4  : org = 0x00000000, len = 0
-  ram5  : org = 0x00000000, len = 0
-  ram6  : org = 0x00000000, len = 0
-  ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for Main stack. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("MAIN_STACK_RAM", ram0);
-
-/* RAM region to be used for the process stack. This is the stack used by
-   the main() function.*/
-REGION_ALIAS("PROCESS_STACK_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-
-INCLUDE rules.ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
deleted file mode 100644
index 409c015..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of the ChibiOS generic TM4C123x startup and CMSIS files.
-STARTUPSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt1.c \
-             $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c
-          
-STARTUPASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
-
-STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/devices/TM4C123x \
-             $(CHIBIOS)/os/ext/CMSIS/include
-
-STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/ld
diff --git a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk b/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
deleted file mode 100644
index f24e046..0000000
--- a/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of the ChibiOS generic TM4C129x startup and CMSIS files.
-STARTUPSRC = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt1.c \
-             $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/vectors.c
-          
-STARTUPASM = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
-
-STARTUPINC = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/devices/TM4C129x \
-             $(CHIBIOS)/os/ext/CMSIS/include
-
-STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld
new file mode 100644
index 0000000..f4bee6d
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xC3.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C123xC3 memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 32k
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 12k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld
new file mode 100644
index 0000000..5f3ad2a
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xD5.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C123xD5 memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 64k
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 24k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld
new file mode 100644
index 0000000..bd5e79b
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xE6.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C123xE6 memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 128k
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 32k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld
new file mode 100644
index 0000000..e00bcda
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C123xH6.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C123xH6 memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 256k
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 32k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld
new file mode 100644
index 0000000..31db415
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xKC.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C129xKC memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 512k
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 256k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld
new file mode 100644
index 0000000..e0de07f
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/ld/TM4C129xNC.ld
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2014 Marco Veeneman
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * TM4C123xH6 memory setup.
+ */
+MEMORY
+{
+  flash0  : org = 0x00000000, len = 1m
+  flash1  : org = 0x00000000, len = 0
+  flash2  : org = 0x00000000, len = 0
+  flash3  : org = 0x00000000, len = 0
+  flash4  : org = 0x00000000, len = 0
+  flash5  : org = 0x00000000, len = 0
+  flash6  : org = 0x00000000, len = 0
+  flash7  : org = 0x00000000, len = 0
+  ram0    : org = 0x20000000, len = 256k
+  ram1    : org = 0x00000000, len = 0
+  ram2    : org = 0x00000000, len = 0
+  ram3    : org = 0x00000000, len = 0
+  ram4    : org = 0x00000000, len = 0
+  ram5    : org = 0x00000000, len = 0
+  ram6    : org = 0x00000000, len = 0
+  ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for HEAP segment.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+INCLUDE rules.ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
new file mode 100644
index 0000000..eb87c20
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
@@ -0,0 +1,11 @@
+# List of the ChibiOS generic TM4C123x startup and CMSIS files.
+STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
+
+STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.s
+
+STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+             $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/TM4C123x \
+             $(CHIBIOS)/os/common/ext/CMSIS/include
+
+STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
new file mode 100644
index 0000000..4046774
--- /dev/null
+++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c129x.mk
@@ -0,0 +1,11 @@
+# List of the ChibiOS generic TM4C129x startup and CMSIS files.
+STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
+             $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
+
+STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.s
+
+STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
+             $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/TM4C129x \
+             $(CHIBIOS)/os/common/ext/CMSIS/include
+
+STARTUPLD  = $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/ld
diff --git a/os/common/ports/ARMCMx/devices/TM4C123x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h
index c9e98bd..c9e98bd 100644
--- a/os/common/ports/ARMCMx/devices/TM4C123x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/TM4C123x/cmparams.h
diff --git a/os/common/ports/ARMCMx/devices/TM4C129x/cmparams.h b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h
index 5bd8a7b..5bd8a7b 100644
--- a/os/common/ports/ARMCMx/devices/TM4C129x/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/TM4C129x/cmparams.h
diff --git a/os/hal/ports/KINETIS/K20x/hal_lld.h b/os/hal/ports/KINETIS/K20x/hal_lld.h
index 31364cf..b7f6b46 100644
--- a/os/hal/ports/KINETIS/K20x/hal_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _HAL_LLD_H_

-#define _HAL_LLD_H_

+#ifndef HAL_LLD_H_

+#define HAL_LLD_H_

 

 #include "kinetis_registry.h"

 

@@ -297,6 +297,6 @@ extern "C" {
 }

 #endif

 

-#endif /* _HAL_LLD_H_ */

+#endif /* HAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/pwm_lld.c b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c
index f5a8d96..f5a8d96 100644
--- a/os/hal/ports/KINETIS/K20x/pwm_lld.c
+++ b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c
diff --git a/os/hal/ports/KINETIS/K20x/pwm_lld.h b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.h
index 176e8a8..ccc100f 100644
--- a/os/hal/ports/KINETIS/K20x/pwm_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PWM_LLD_H_

-#define _PWM_LLD_H_

+#ifndef HAL_PWM_LLD_H_

+#define HAL_PWM_LLD_H_

 

 #if HAL_USE_PWM || defined(__DOXYGEN__)

 

@@ -265,6 +265,6 @@ extern "C" {
 

 #endif /* HAL_USE_PWM */

 

-#endif /* _PWM_LLD_H_ */

+#endif /* HAL_PWM_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/spi_lld.c b/os/hal/ports/KINETIS/K20x/hal_spi_lld.c
index 29ab4e8..29ab4e8 100644
--- a/os/hal/ports/KINETIS/K20x/spi_lld.c
+++ b/os/hal/ports/KINETIS/K20x/hal_spi_lld.c
diff --git a/os/hal/ports/KINETIS/K20x/spi_lld.h b/os/hal/ports/KINETIS/K20x/hal_spi_lld.h
index a1f2a99..0cf108e 100644
--- a/os/hal/ports/KINETIS/K20x/spi_lld.h
+++ b/os/hal/ports/KINETIS/K20x/hal_spi_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _SPI_LLD_H_

-#define _SPI_LLD_H_

+#ifndef HAL_SPI_LLD_H_

+#define HAL_SPI_LLD_H_

 

 #if HAL_USE_SPI || defined(__DOXYGEN__)

 

@@ -256,6 +256,6 @@ extern "C" {
 

 #endif /* HAL_USE_SPI */

 

-#endif /* _SPI_LLD_H_ */

+#endif /* HAL_SPI_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/kinetis_registry.h b/os/hal/ports/KINETIS/K20x/kinetis_registry.h
index 4c70e84..d2eea6f 100644
--- a/os/hal/ports/KINETIS/K20x/kinetis_registry.h
+++ b/os/hal/ports/KINETIS/K20x/kinetis_registry.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _KINETIS_REGISTRY_H_

-#define _KINETIS_REGISTRY_H_

+#ifndef KINETIS_REGISTRY_H_

+#define KINETIS_REGISTRY_H_

 

 #if !defined(K20x) || defined(__DOXYGEN__)

 #define K20x

@@ -253,6 +253,6 @@
 

 /** @} */

 

-#endif /* _KINETIS_REGISTRY_H_ */

+#endif /* KINETIS_REGISTRY_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/K20x/platform.mk b/os/hal/ports/KINETIS/K20x/platform.mk
index baa90a2..beee336 100644
--- a/os/hal/ports/KINETIS/K20x/platform.mk
+++ b/os/hal/ports/KINETIS/K20x/platform.mk
@@ -1,16 +1,16 @@
 # List of all platform files.

 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

               ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/pal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/serial_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/spi_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/i2c_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/ext_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/adc_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/gpt_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/pwm_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/st_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/usb_lld.c

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_pal_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_serial_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_spi_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_ext_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_adc_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/K20x/hal_pwm_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_st_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_usb_lld.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

diff --git a/os/hal/ports/KINETIS/KL2x/hal_lld.h b/os/hal/ports/KINETIS/KL2x/hal_lld.h
index a10c21c..d16e13f 100644
--- a/os/hal/ports/KINETIS/KL2x/hal_lld.h
+++ b/os/hal/ports/KINETIS/KL2x/hal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _HAL_LLD_H_

-#define _HAL_LLD_H_

+#ifndef HAL_LLD_H_

+#define HAL_LLD_H_

 

 #include "kl2xz.h"

 #include "kinetis_registry.h"

@@ -311,6 +311,6 @@ extern "C" {
 }

 #endif

 

-#endif /* _HAL_LLD_H_ */

+#endif /* HAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/pwm_lld.c b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c
index 2f56216..2f56216 100644
--- a/os/hal/ports/KINETIS/KL2x/pwm_lld.c
+++ b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c
diff --git a/os/hal/ports/KINETIS/KL2x/pwm_lld.h b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.h
index 5a3d7c2..64ff9ee 100644
--- a/os/hal/ports/KINETIS/KL2x/pwm_lld.h
+++ b/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PWM_LLD_H_

-#define _PWM_LLD_H_

+#ifndef HAL_PWM_LLD_H_

+#define HAL_PWM_LLD_H_

 

 #if HAL_USE_PWM || defined(__DOXYGEN__)

 

@@ -300,6 +300,6 @@ extern "C" {
 

 #endif /* HAL_USE_PWM */

 

-#endif /* _PWM_LLD_H_ */

+#endif /* HAL_PWM_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/kinetis_registry.h b/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
index 92ea0cc..49b1ec8 100644
--- a/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
+++ b/os/hal/ports/KINETIS/KL2x/kinetis_registry.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _KINETIS_REGISTRY_H_

-#define _KINETIS_REGISTRY_H_

+#ifndef KINETIS_REGISTRY_H_

+#define KINETIS_REGISTRY_H_

 

 #if !defined(KL2x) || defined(__DOXYGEN__)

 #define KL2x

@@ -253,6 +253,6 @@
 

 /** @} */

 

-#endif /* _KINETIS_REGISTRY_H_ */

+#endif /* KINETIS_REGISTRY_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/KL2x/platform.mk b/os/hal/ports/KINETIS/KL2x/platform.mk
index 8ababc3..dda7a6d 100644
--- a/os/hal/ports/KINETIS/KL2x/platform.mk
+++ b/os/hal/ports/KINETIS/KL2x/platform.mk
@@ -1,15 +1,15 @@
 # List of all platform files.

 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \

               ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/hal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/pal_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/serial_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/i2c_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/ext_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/adc_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/gpt_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/pwm_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/st_lld.c \

-              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/usb_lld.c

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_pal_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_serial_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_ext_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_adc_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/KL2x/hal_pwm_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_st_lld.c \

+              ${CHIBIOS_CONTRIB}/os/hal/ports/KINETIS/LLD/hal_usb_lld.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \

diff --git a/os/hal/ports/KINETIS/LLD/adc_lld.c b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c
index c0904c8..c0904c8 100644
--- a/os/hal/ports/KINETIS/LLD/adc_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/adc_lld.h b/os/hal/ports/KINETIS/LLD/hal_adc_lld.h
index 22db2c0..c4edbd6 100644
--- a/os/hal/ports/KINETIS/LLD/adc_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_adc_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _ADC_LLD_H_

-#define _ADC_LLD_H_

+#ifndef HAL_ADC_LLD_H_

+#define HAL_ADC_LLD_H_

 

 #if HAL_USE_ADC || defined(__DOXYGEN__)

 

@@ -355,6 +355,6 @@ extern "C" {
 

 #endif /* HAL_USE_ADC */

 

-#endif /* _ADC_LLD_H_ */

+#endif /* HAL_ADC_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/ext_lld.c b/os/hal/ports/KINETIS/LLD/hal_ext_lld.c
index 21bb6e0..21bb6e0 100644
--- a/os/hal/ports/KINETIS/LLD/ext_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_ext_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/ext_lld.h b/os/hal/ports/KINETIS/LLD/hal_ext_lld.h
index 465bb89..bcd9cb0 100644
--- a/os/hal/ports/KINETIS/LLD/ext_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_ext_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _EXT_LLD_H_

-#define _EXT_LLD_H_

+#ifndef HAL_EXT_LLD_H_

+#define HAL_EXT_LLD_H_

 

 #if HAL_USE_EXT || defined(__DOXYGEN__)

 

@@ -183,6 +183,6 @@ extern "C" {
 

 #endif /* HAL_USE_EXT */

 

-#endif /* _EXT_LLD_H_ */

+#endif /* HAL_EXT_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/gpt_lld.c b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c
index 6e88f88..6e88f88 100644
--- a/os/hal/ports/KINETIS/LLD/gpt_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/gpt_lld.h b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.h
index 5c3e233..1b9e5ef 100644
--- a/os/hal/ports/KINETIS/LLD/gpt_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_gpt_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _GPT_LLD_H_

-#define _GPT_LLD_H_

+#ifndef HAL_GPT_LLD_H_

+#define HAL_GPT_LLD_H_

 

 #if HAL_USE_GPT || defined(__DOXYGEN__)

 

@@ -328,6 +328,6 @@ extern "C" {
 

 #endif /* HAL_USE_GPT */

 

-#endif /* _GPT_LLD_H_ */

+#endif /* HAL_GPT_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/i2c_lld.c b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c
index 3659a93..3659a93 100644
--- a/os/hal/ports/KINETIS/LLD/i2c_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/i2c_lld.h b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.h
index 5f1ed87..a7214c5 100644
--- a/os/hal/ports/KINETIS/LLD/i2c_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_i2c_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _I2C_LLD_H_

-#define _I2C_LLD_H_

+#ifndef HAL_I2C_LLD_H_

+#define HAL_I2C_LLD_H_

 

 #if HAL_USE_I2C || defined(__DOXYGEN__)

 

@@ -231,6 +231,6 @@ extern "C" {
 

 #endif /* HAL_USE_I2C */

 

-#endif /* _I2C_LLD_H_ */

+#endif /* HAL_I2C_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/pal_lld.c b/os/hal/ports/KINETIS/LLD/hal_pal_lld.c
index b307833..b307833 100644
--- a/os/hal/ports/KINETIS/LLD/pal_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/pal_lld.h b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h
index 2bd9872..05749d5 100644
--- a/os/hal/ports/KINETIS/LLD/pal_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_pal_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _PAL_LLD_H_

-#define _PAL_LLD_H_

+#ifndef HAL_PAL_LLD_H_

+#define HAL_PAL_LLD_H_

 

 #if HAL_USE_PAL || defined(__DOXYGEN__)

 

@@ -381,6 +381,6 @@ extern "C" {
 

 #endif /* HAL_USE_PAL */

 

-#endif /* _PAL_LLD_H_ */

+#endif /* HAL_PAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/serial_lld.c b/os/hal/ports/KINETIS/LLD/hal_serial_lld.c
index c80cf22..c80cf22 100644
--- a/os/hal/ports/KINETIS/LLD/serial_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_serial_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/serial_lld.h b/os/hal/ports/KINETIS/LLD/hal_serial_lld.h
index cc66eb3..f11c063 100644
--- a/os/hal/ports/KINETIS/LLD/serial_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_serial_lld.h
@@ -22,8 +22,8 @@
  * @{

  */

 

-#ifndef _SERIAL_LLD_H_

-#define _SERIAL_LLD_H_

+#ifndef HAL_SERIAL_LLD_H_

+#define HAL_SERIAL_LLD_H_

 

 #if HAL_USE_SERIAL || defined(__DOXYGEN__)

 

@@ -215,6 +215,6 @@ extern "C" {
 

 #endif /* HAL_USE_SERIAL */

 

-#endif /* _SERIAL_LLD_H_ */

+#endif /* HAL_SERIAL_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/st_lld.c b/os/hal/ports/KINETIS/LLD/hal_st_lld.c
index e6ed9e5..e6ed9e5 100644
--- a/os/hal/ports/KINETIS/LLD/st_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_st_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/st_lld.h b/os/hal/ports/KINETIS/LLD/hal_st_lld.h
index c67a5d0..29c7035 100644
--- a/os/hal/ports/KINETIS/LLD/st_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_st_lld.h
@@ -24,8 +24,8 @@
  * @{

  */

 

-#ifndef _ST_LLD_H_

-#define _ST_LLD_H_

+#ifndef HAL_ST_LLD_H_

+#define HAL_ST_LLD_H_

 

 #include "mcuconf.h"

 

@@ -151,6 +151,6 @@ static inline bool st_lld_is_alarm_active(void) {
   return false;

 }

 

-#endif /* _ST_LLD_H_ */

+#endif /* HAL_ST_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/KINETIS/LLD/usb_lld.c b/os/hal/ports/KINETIS/LLD/hal_usb_lld.c
index 159aef9..159aef9 100644
--- a/os/hal/ports/KINETIS/LLD/usb_lld.c
+++ b/os/hal/ports/KINETIS/LLD/hal_usb_lld.c
diff --git a/os/hal/ports/KINETIS/LLD/usb_lld.h b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h
index 978e8a6..593ef16 100644
--- a/os/hal/ports/KINETIS/LLD/usb_lld.h
+++ b/os/hal/ports/KINETIS/LLD/hal_usb_lld.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef _USB_LLD_H_

-#define _USB_LLD_H_

+#ifndef HAL_USB_LLD_H_

+#define HAL_USB_LLD_H_

 

 #if HAL_USE_USB || defined(__DOXYGEN__)

 

@@ -423,6 +423,6 @@ extern "C" {
 

 #endif /* HAL_USE_USB */

 

-#endif /* _USB_LLD_H_ */

+#endif /* HAL_USB_LLD_H_ */

 

 /** @} */

diff --git a/os/hal/ports/TIVA/LLD/ext_lld.c b/os/hal/ports/TIVA/LLD/hal_ext_lld.c
index dc58d99..dc58d99 100644
--- a/os/hal/ports/TIVA/LLD/ext_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_ext_lld.c
diff --git a/os/hal/ports/TIVA/LLD/ext_lld.h b/os/hal/ports/TIVA/LLD/hal_ext_lld.h
index 3817130..a75f167 100644
--- a/os/hal/ports/TIVA/LLD/ext_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_ext_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _EXT_LLD_H_
-#define _EXT_LLD_H_
+#ifndef HAL_EXT_LLD_H
+#define HAL_EXT_LLD_H
 
 #if HAL_USE_EXT || defined(__DOXYGEN__)
 
@@ -518,6 +518,6 @@ extern "C" {
 
 #endif /* HAL_USE_EXT */
 
-#endif /* _EXT_LLD_H_ */
+#endif /* HAL_EXT_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/gpt_lld.c b/os/hal/ports/TIVA/LLD/hal_gpt_lld.c
index c160687..c160687 100644
--- a/os/hal/ports/TIVA/LLD/gpt_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_gpt_lld.c
diff --git a/os/hal/ports/TIVA/LLD/gpt_lld.h b/os/hal/ports/TIVA/LLD/hal_gpt_lld.h
index 2f1f75d..b6f6667 100644
--- a/os/hal/ports/TIVA/LLD/gpt_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_gpt_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _GPT_LLD_H_
-#define _GPT_LLD_H_
+#ifndef HAL_GPT_LLD_H
+#define HAL_GPT_LLD_H
 
 #if HAL_USE_GPT || defined(__DOXYGEN__)
 
@@ -496,6 +496,6 @@ extern "C" {
 
 #endif /* HAL_USE_GPT */
 
-#endif /* _GPT_LLD_H_ */
+#endif /* HAL_GPT_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/i2c_lld.c b/os/hal/ports/TIVA/LLD/hal_i2c_lld.c
index f4c555b..f4c555b 100644
--- a/os/hal/ports/TIVA/LLD/i2c_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_i2c_lld.c
diff --git a/os/hal/ports/TIVA/LLD/i2c_lld.h b/os/hal/ports/TIVA/LLD/hal_i2c_lld.h
index 1479600..d112867 100644
--- a/os/hal/ports/TIVA/LLD/i2c_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_i2c_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _I2C_LLD_H_
-#define _I2C_LLD_H_
+#ifndef HAL_I2C_LLD_H
+#define HAL_I2C_LLD_H
 
 #if HAL_USE_I2C || defined(__DOXYGEN__)
 
@@ -522,6 +522,6 @@ extern "C" {
 
 #endif /* HAL_USE_I2C  */
 
-#endif /* _I2C_LLD_H_ */
+#endif /* HAL_I2C_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/mac_lld.c b/os/hal/ports/TIVA/LLD/hal_mac_lld.c
index 226695e..3c6c739 100644
--- a/os/hal/ports/TIVA/LLD/mac_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_mac_lld.c
@@ -28,7 +28,7 @@
 
 #if HAL_USE_MAC || defined(__DOXYGEN__)
 
-#include "mii.h"
+#include "hal_mii.h"
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/os/hal/ports/TIVA/LLD/mac_lld.h b/os/hal/ports/TIVA/LLD/hal_mac_lld.h
index af088b0..9d030d7 100644
--- a/os/hal/ports/TIVA/LLD/mac_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_mac_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _MAC_LLD_H_
-#define _MAC_LLD_H_
+#ifndef HAL_MAC_LLD_H
+#define HAL_MAC_LLD_H
 
 #if HAL_USE_MAC || defined(__DOXYGEN__)
 
@@ -433,6 +433,6 @@ extern "C" {
 
 #endif /* HAL_USE_MAC */
 
-#endif /* _MAC_LLD_H_ */
+#endif /* HAL_MAC_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/pal_lld.c b/os/hal/ports/TIVA/LLD/hal_pal_lld.c
index 50a9a82..50a9a82 100644
--- a/os/hal/ports/TIVA/LLD/pal_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_pal_lld.c
diff --git a/os/hal/ports/TIVA/LLD/pal_lld.h b/os/hal/ports/TIVA/LLD/hal_pal_lld.h
index 116c659..acde7e6 100644
--- a/os/hal/ports/TIVA/LLD/pal_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_pal_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _PAL_LLD_H_
-#define _PAL_LLD_H_
+#ifndef HAL_PAL_LLD_H
+#define HAL_PAL_LLD_H
 
 #if HAL_USE_PAL || defined(__DOXYGEN__)
 
@@ -755,7 +755,7 @@ extern "C" {
 
 #endif /* HAL_USE_PAL */
 
-#endif /* _PAL_LLD_H_ */
+#endif /* HAL_PAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/LLD/pwm_lld.c b/os/hal/ports/TIVA/LLD/hal_pwm_lld.c
index fdde9f8..fdde9f8 100644
--- a/os/hal/ports/TIVA/LLD/pwm_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_pwm_lld.c
diff --git a/os/hal/ports/TIVA/LLD/pwm_lld.h b/os/hal/ports/TIVA/LLD/hal_pwm_lld.h
index 472bae8..374c563 100644
--- a/os/hal/ports/TIVA/LLD/pwm_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_pwm_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _PWM_LLD_H_
-#define _PWM_LLD_H_
+#ifndef HAL_PWM_LLD_H
+#define HAL_PWM_LLD_H
 
 #if HAL_USE_PWM || defined(__DOXYGEN__)
 
@@ -367,6 +367,6 @@ extern "C" {
 
 #endif /* HAL_USE_PWM */
 
-#endif /* _PWM_LLD_H_ */
+#endif /* HAL_PWM_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/serial_lld.c b/os/hal/ports/TIVA/LLD/hal_serial_lld.c
index 92761dc..92761dc 100644
--- a/os/hal/ports/TIVA/LLD/serial_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_serial_lld.c
diff --git a/os/hal/ports/TIVA/LLD/serial_lld.h b/os/hal/ports/TIVA/LLD/hal_serial_lld.h
index 535d0a5..0301a5a 100644
--- a/os/hal/ports/TIVA/LLD/serial_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_serial_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SERIAL_LLD_H_
-#define _SERIAL_LLD_H_
+#ifndef HAL_SERIAL_LLD_H
+#define HAL_SERIAL_LLD_H
 
 #if HAL_USE_SERIAL || defined(__DOXYGEN__)
 
@@ -477,6 +477,6 @@ extern "C" {
 
 #endif /* HAL_USE_SERIAL */
 
-#endif /* _SERIAL_LLD_H_ */
+#endif /* HAL_SERIAL_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/spi_lld.c b/os/hal/ports/TIVA/LLD/hal_spi_lld.c
index cd1c3cf..cd1c3cf 100644
--- a/os/hal/ports/TIVA/LLD/spi_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_spi_lld.c
diff --git a/os/hal/ports/TIVA/LLD/spi_lld.h b/os/hal/ports/TIVA/LLD/hal_spi_lld.h
index 5c04d69..810489a 100644
--- a/os/hal/ports/TIVA/LLD/spi_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_spi_lld.h
@@ -22,8 +22,8 @@
  * @{
  */
 
-#ifndef _SPI_LLD_H_
-#define _SPI_LLD_H_
+#ifndef HAL_SPI_LLD_H
+#define HAL_SPI_LLD_H
 
 #if HAL_USE_SPI || defined(__DOXYGEN__)
 
@@ -383,6 +383,6 @@ extern "C" {
 
 #endif /* HAL_USE_SPI */
 
-#endif /* _SPI_LLD_H_ */
+#endif /* HAL_SPI_LLD_H */
 
 /** @} */
diff --git a/os/hal/ports/TIVA/LLD/st_lld.c b/os/hal/ports/TIVA/LLD/hal_st_lld.c
index 1109855..1109855 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.c
+++ b/os/hal/ports/TIVA/LLD/hal_st_lld.c
diff --git a/os/hal/ports/TIVA/LLD/st_lld.h b/os/hal/ports/TIVA/LLD/hal_st_lld.h
index 23b3ef5..61acbf0 100644
--- a/os/hal/ports/TIVA/LLD/st_lld.h
+++ b/os/hal/ports/TIVA/LLD/hal_st_lld.h
@@ -24,8 +24,8 @@
  * @{
  */
 
-#ifndef _ST_LLD_H_
-#define _ST_LLD_H_
+#ifndef HAL_ST_LLD_H
+#define HAL_ST_LLD_H
 
 #include "mcuconf.h"
 #include "tiva_registry.h"
@@ -269,7 +269,7 @@ static inline bool st_lld_is_alarm_active(void)
   return (bool) ((TIVA_ST_TIM->IMR & GPTM_IMR_TAMIM) !=0);
 }
 
-#endif /* _ST_LLD_H_ */
+#endif /* HAL_ST_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C123x/hal_lld.h b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
index 5c2cd25..ea8fc79 100644
--- a/os/hal/ports/TIVA/TM4C123x/hal_lld.h
+++ b/os/hal/ports/TIVA/TM4C123x/hal_lld.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _HAL_LLD_H_
-#define _HAL_LLD_H_
+#ifndef HAL_LLD_H
+#define HAL_LLD_H
 
 #include "tiva_registry.h"
 
@@ -355,7 +355,7 @@ extern "C" {
 }
 #endif
 
-#endif /* _HAL_LLD_H_ */
+#endif /* HAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C123x/platform.mk b/os/hal/ports/TIVA/TM4C123x/platform.mk
index 0e69f15..1b8d9ac 100644
--- a/os/hal/ports/TIVA/TM4C123x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -1,15 +1,15 @@
 # List of all the TM4C123x platform files.
 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
               ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C123x/hal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/i2c_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/gpt_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pwm_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/spi_lld.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/tiva_udma.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_st_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pal_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_serial_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_i2c_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_gpt_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pwm_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_spi_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/tiva_udma.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_ext_lld.c
 
 # Required include directories
 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
diff --git a/os/hal/ports/TIVA/TM4C129x/hal_lld.h b/os/hal/ports/TIVA/TM4C129x/hal_lld.h
index dc6644f..9a8f690 100644
--- a/os/hal/ports/TIVA/TM4C129x/hal_lld.h
+++ b/os/hal/ports/TIVA/TM4C129x/hal_lld.h
@@ -25,8 +25,8 @@
  * @{
  */
 
-#ifndef _HAL_LLD_H_
-#define _HAL_LLD_H_
+#ifndef HAL_LLD_H
+#define HAL_LLD_H
 
 #include "tiva_registry.h"
 
@@ -369,7 +369,7 @@ extern "C" {
 }
 #endif
 
-#endif /* _HAL_LLD_H_ */
+#endif /* HAL_LLD_H */
 
 /**
  * @}
diff --git a/os/hal/ports/TIVA/TM4C129x/platform.mk b/os/hal/ports/TIVA/TM4C129x/platform.mk
index a3577d1..6f0c0df 100644
--- a/os/hal/ports/TIVA/TM4C129x/platform.mk
+++ b/os/hal/ports/TIVA/TM4C129x/platform.mk
@@ -1,11 +1,11 @@
 # List of all the TM4C129x platform files.
 PLATFORMSRC = ${CHIBIOS}/os/hal/ports/common/ARMCMx/nvic.c \
               ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/TM4C129x/hal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/st_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/pal_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/serial_lld.c \
-              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/mac_lld.c \
-              ${CHISIOS_CONTRIB}/os/hal/ports/TIVA/LLD/ext_lld.c
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_st_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_pal_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_serial_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_mac_lld.c \
+              ${CHIBIOS_CONTRIB}/os/hal/ports/TIVA/LLD/hal_ext_lld.c
 
 # Required include directories
 PLATFORMINC = ${CHIBIOS}/os/hal/ports/common/ARMCMx \
diff --git a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c
index c90e014..616c7c6 100644
--- a/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c
+++ b/testhal/KINETIS/FRDM-K20D50M/USB_SERIAL/main.c
@@ -20,7 +20,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "shell.h"

 #include "chprintf.h"

diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h
index a185ac6..7b54de5 100644
--- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h
+++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/chconf.h
@@ -366,7 +366,7 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

-#define CH_DBG_ENABLE_STACK_CHECK           TRUE

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

diff --git a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c
index 103991a..897dc58 100644
--- a/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c
+++ b/testhal/KINETIS/FRDM-KL25Z/USB_SERIAL/main.c
@@ -20,7 +20,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "shell.h"

 #include "chprintf.h"

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
index 48f3aae..c7ed185 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h
@@ -366,7 +366,7 @@
  * @note    The default failure mode is to halt the system with the global

  *          @p panic_msg variable set to @p NULL.

  */

-#define CH_DBG_ENABLE_STACK_CHECK           TRUE

+#define CH_DBG_ENABLE_STACK_CHECK           FALSE

 

 /**

  * @brief   Debug option, stacks initialization.

diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c
index 103991a..897dc58 100644
--- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c
+++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/main.c
@@ -20,7 +20,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "shell.h"

 #include "chprintf.h"

diff --git a/testhal/KINETIS/MCHCK/USB_SERIAL/main.c b/testhal/KINETIS/MCHCK/USB_SERIAL/main.c
index 62771c9..56e02af 100644
--- a/testhal/KINETIS/MCHCK/USB_SERIAL/main.c
+++ b/testhal/KINETIS/MCHCK/USB_SERIAL/main.c
@@ -20,7 +20,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "shell.h"

 #include "chprintf.h"

diff --git a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c
index 3553c6b..3ede0a2 100644
--- a/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c
+++ b/testhal/KINETIS/TEENSY3_x/USB_SERIAL/main.c
@@ -20,7 +20,6 @@
 

 #include "ch.h"

 #include "hal.h"

-#include "test.h"

 

 #include "shell.h"

 #include "chprintf.h"

diff --git a/testhal/TIVA/TM4C123x/EXT/Makefile b/testhal/TIVA/TM4C123x/EXT/Makefile
index bfcb376..f171975 100644
--- a/testhal/TIVA/TM4C123x/EXT/Makefile
+++ b/testhal/TIVA/TM4C123x/EXT/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 
 # Define linker script file here
@@ -206,5 +206,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/testhal/TIVA/TM4C123x/EXT/chconf.h b/testhal/TIVA/TM4C123x/EXT/chconf.h
index 5e26c27..b1b7767 100644
--- a/testhal/TIVA/TM4C123x/EXT/chconf.h
+++ b/testhal/TIVA/TM4C123x/EXT/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/testhal/TIVA/TM4C123x/GPT/Makefile b/testhal/TIVA/TM4C123x/GPT/Makefile
index bfcb376..f171975 100644
--- a/testhal/TIVA/TM4C123x/GPT/Makefile
+++ b/testhal/TIVA/TM4C123x/GPT/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 
 # Define linker script file here
@@ -206,5 +206,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/testhal/TIVA/TM4C123x/GPT/chconf.h b/testhal/TIVA/TM4C123x/GPT/chconf.h
index 25b16cc..5e7c63d 100644
--- a/testhal/TIVA/TM4C123x/GPT/chconf.h
+++ b/testhal/TIVA/TM4C123x/GPT/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/testhal/TIVA/TM4C123x/I2C/Makefile b/testhal/TIVA/TM4C123x/I2C/Makefile
index f50e3b9..f7c3573 100644
--- a/testhal/TIVA/TM4C123x/I2C/Makefile
+++ b/testhal/TIVA/TM4C123x/I2C/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 
 # Define linker script file here
@@ -207,5 +207,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/testhal/TIVA/TM4C123x/I2C/chconf.h b/testhal/TIVA/TM4C123x/I2C/chconf.h
index 25b16cc..5e7c63d 100644
--- a/testhal/TIVA/TM4C123x/I2C/chconf.h
+++ b/testhal/TIVA/TM4C123x/I2C/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/testhal/TIVA/TM4C123x/PWM/Makefile b/testhal/TIVA/TM4C123x/PWM/Makefile
index bfcb376..f171975 100644
--- a/testhal/TIVA/TM4C123x/PWM/Makefile
+++ b/testhal/TIVA/TM4C123x/PWM/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 
 # Define linker script file here
@@ -206,5 +206,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/testhal/TIVA/TM4C123x/PWM/chconf.h b/testhal/TIVA/TM4C123x/PWM/chconf.h
index 25b16cc..5e7c63d 100644
--- a/testhal/TIVA/TM4C123x/PWM/chconf.h
+++ b/testhal/TIVA/TM4C123x/PWM/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/
diff --git a/testhal/TIVA/TM4C123x/SPI/Makefile b/testhal/TIVA/TM4C123x/SPI/Makefile
index bfcb376..f171975 100644
--- a/testhal/TIVA/TM4C123x/SPI/Makefile
+++ b/testhal/TIVA/TM4C123x/SPI/Makefile
@@ -83,7 +83,7 @@ PROJECT = ch
 CHIBIOS = ../../../../../ChibiOS-RT
 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
 # Startup files.
-include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
+include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_tm4c123x.mk
 # HAL-OSAL files (optional).
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS_CONTRIB)/os/hal/ports/TIVA/TM4C123x/platform.mk
@@ -91,7 +91,7 @@ include $(CHIBIOS_CONTRIB)/os/hal/boards/TI_TM4C123G_LAUNCHPAD/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 
 # Define linker script file here
@@ -206,5 +206,5 @@ ULIBS =
 # End of user defines
 ##############################################################################
 
-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC
+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 include $(RULESPATH)/rules.mk
diff --git a/testhal/TIVA/TM4C123x/SPI/chconf.h b/testhal/TIVA/TM4C123x/SPI/chconf.h
index 25b16cc..5e7c63d 100644
--- a/testhal/TIVA/TM4C123x/SPI/chconf.h
+++ b/testhal/TIVA/TM4C123x/SPI/chconf.h
@@ -1,6 +1,8 @@
 #ifndef _CHCONF_H_
 #define _CHCONF_H_
 
+#define _CHIBIOS_RT_CONF_
+
 /*===========================================================================*/
 /**
  * @name System timers settings
@@ -414,6 +416,20 @@
 }
 
 /**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
  * @brief   Idle thread enter hook.
  * @note    This hook is invoked within a critical zone, no OS functions
  *          should be invoked from here.
@@ -457,6 +473,15 @@
   /* System halt code here.*/                                               \
 }
 
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
 /** @} */
 
 /*===========================================================================*/