diff options
Diffstat (limited to 'c/src/lib/libbsp/arm/lpc24xx')
| -rw-r--r-- | c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 3 | ||||
| -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 |
2 files changed, 12 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index c7fcb86d13..43e65143f1 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -105,7 +105,8 @@ libbsp_a_SOURCES += ../../shared/cpucounterdiff.c # Startup libbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S -libbsp_a_SOURCES += startup/bspreset.c +libbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c +libbsp_a_SOURCES += startup/bspreset-armv4.c libbsp_a_SOURCES += startup/bspstart.c # IRQ 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 */ |