diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-03-28 08:04:45 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-03-28 08:04:45 +0000 |
| commit | 347b801809d0c9c30c046d3a60277d05b1c8d86c (patch) | |
| tree | 0a6f90a4cb0a67772ecb2b7c19743dd35125a8f0 /os/ports/GCC/ARMCMx | |
| parent | 193bbcc9dd5305cb40057cfb7731006ac3600e35 (diff) | |
| download | ChibiOS-347b801809d0c9c30c046d3a60277d05b1c8d86c.tar.gz ChibiOS-347b801809d0c9c30c046d3a60277d05b1c8d86c.tar.bz2 ChibiOS-347b801809d0c9c30c046d3a60277d05b1c8d86c.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1797 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports/GCC/ARMCMx')
| -rw-r--r-- | os/ports/GCC/ARMCMx/LPC11xx/cmparams.h | 3 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/STM32F103/cmparams.h | 3 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/chcore.h | 3 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/cmsis/core_cm0.h | 3 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/cmsis/core_cm3.h | 3 | ||||
| -rw-r--r-- | os/ports/GCC/ARMCMx/crt0.s | 2 |
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
|