6 files changed, 7 insertions, 10 deletions
diff --git a/os/ports/GCC/ARMCMx/LPC11xx/cmparams.h b/os/ports/GCC/ARMCMx/LPC11xx/cmparams.h
index 790d529cb..7b8834ac9 100644
--- a/os/ports/GCC/ARMCMx/LPC11xx/cmparams.h
+++ b/os/ports/GCC/ARMCMx/LPC11xx/cmparams.h
@@ -35,6 +35,9 @@
 /* Constants parameters.                                                     */
 /*===========================================================================*/
 
+#define CORTEX_M0               0       /**< @brief Cortex-M0 variant.      */
+#define CORTEX_M3               3       /**< @brief Cortex-M3 variant.      */
+
 /**
  * @brief   Cortex core model.
  */
diff --git a/os/ports/GCC/ARMCMx/STM32F103/cmparams.h b/os/ports/GCC/ARMCMx/STM32F103/cmparams.h
index e810d1868..70c28e875 100644
--- a/os/ports/GCC/ARMCMx/STM32F103/cmparams.h
+++ b/os/ports/GCC/ARMCMx/STM32F103/cmparams.h
@@ -35,6 +35,9 @@
 /* Constants parameters.                                                     */
 /*===========================================================================*/
 
+#define CORTEX_M0               0       /**< @brief Cortex-M0 variant.      */
+#define CORTEX_M3               3       /**< @brief Cortex-M3 variant.      */
+
 /**
  * @brief   Cortex core model.
  */
diff --git a/os/ports/GCC/ARMCMx/chcore.h b/os/ports/GCC/ARMCMx/chcore.h
index 2f69209ba..1927ccff0 100644
--- a/os/ports/GCC/ARMCMx/chcore.h
+++ b/os/ports/GCC/ARMCMx/chcore.h
@@ -39,9 +39,6 @@
 #define ENABLE_WFI_IDLE         0
 #endif
 
-#define CORTEX_M0               0       /**< @brief Cortex-M0 variant.      */
-#define CORTEX_M3               3       /**< @brief Cortex-M3 variant.      */
-
 /**
  * @brief   Name of the implemented architecture.
  */
diff --git a/os/ports/GCC/ARMCMx/cmsis/core_cm0.h b/os/ports/GCC/ARMCMx/cmsis/core_cm0.h
index 0173ec800..af27881d4 100644
--- a/os/ports/GCC/ARMCMx/cmsis/core_cm0.h
+++ b/os/ports/GCC/ARMCMx/cmsis/core_cm0.h
@@ -20,9 +20,6 @@
 /*
  * Parts of this files have been modified in ChibiOS/RT in order to fix
  * some code quality issues.
- * ChibiOS/RT does not use any of the following code but this file is
- * included by the registers definition file so the warnings are still
- * propagated.
  */
 
 /**************************************************************************//**
diff --git a/os/ports/GCC/ARMCMx/cmsis/core_cm3.h b/os/ports/GCC/ARMCMx/cmsis/core_cm3.h
index 81934949b..5c75ec859 100644
--- a/os/ports/GCC/ARMCMx/cmsis/core_cm3.h
+++ b/os/ports/GCC/ARMCMx/cmsis/core_cm3.h
@@ -20,9 +20,6 @@
 /*
  * Parts of this files have been modified in ChibiOS/RT in order to fix
  * some code quality issues.
- * ChibiOS/RT does not use any of the following code but this file is
- * included by the registers definition file so the warnings are still
- * propagated.
  */
 
 /**************************************************************************//**
diff --git a/os/ports/GCC/ARMCMx/crt0.s b/os/ports/GCC/ARMCMx/crt0.s
index fa92b97ea..15aed34a6 100644
--- a/os/ports/GCC/ARMCMx/crt0.s
+++ b/os/ports/GCC/ARMCMx/crt0.s
@@ -77,8 +77,8 @@ dloop:
         bge     enddloop
         ldr     r0, [r1]
         str     r0, [r2]
-        adds    r0, r0, #4
         adds    r1, r1, #4
+        adds    r2, r2, #4
         b       dloop
 enddloop:
 #else