summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/lpc24xx/startup
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-01-12 14:44:10 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-01-19 08:36:19 +0100
commitb32a9cdc1eb893886f21be01bc0a5c1367b6e8be (patch)
treed36dad20fce59ba5916e0809d968e7aa76603ef4 /c/src/lib/libbsp/arm/lpc24xx/startup
parentbsps/arm: Update CMSIS/Include (diff)
downloadrtems-b32a9cdc1eb893886f21be01bc0a5c1367b6e8be.tar.bz2
bsps/arm: Use common ARMv7-M bsp_reset()
Diffstat (limited to 'c/src/lib/libbsp/arm/lpc24xx/startup')
-rw-r--r--c/src/lib/libbsp/arm/lpc24xx/startup/bspreset-armv4.c (renamed from c/src/lib/libbsp/arm/lpc24xx/startup/bspreset.c)21
1 files changed, 10 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset.c b/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset-armv4.c
index cb634317b4..c53b4e2447 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset.c
+++ b/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset-armv4.c
@@ -27,6 +27,8 @@
#include <bsp/lpc24xx.h>
#include <bsp/start.h>
+#ifdef ARM_MULTILIB_ARCH_V4
+
BSP_START_TEXT_SECTION __attribute__((flatten)) void bsp_reset(void)
{
rtems_interrupt_level level;
@@ -34,19 +36,16 @@ BSP_START_TEXT_SECTION __attribute__((flatten)) void bsp_reset(void)
(void) level;
rtems_interrupt_disable(level);
- #if defined(ARM_MULTILIB_ARCH_V4)
- /* Trigger watchdog reset */
- WDCLKSEL = 0;
- WDTC = 0xff;
- WDMOD = 0x3;
- WDFEED = 0xaa;
- WDFEED = 0x55;
- #elif defined(ARM_MULTILIB_ARCH_V7M)
- _ARMV7M_SCB->aircr = ARMV7M_SCB_AIRCR_VECTKEY
- | ARMV7M_SCB_AIRCR_SYSRESETREQ;
- #endif
+ /* Trigger watchdog reset */
+ WDCLKSEL = 0;
+ WDTC = 0xff;
+ WDMOD = 0x3;
+ WDFEED = 0xaa;
+ WDFEED = 0x55;
while (true) {
/* Do nothing */
}
}
+
+#endif /* ARM_MULTILIB_ARCH_V4 */