diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-02 18:00:44 -0500 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-09-04 09:07:56 -0500 |
commit | be4992b1932b098271ff7bd1141b5265f450f8b1 (patch) | |
tree | 4dabb0353a18aef0820cdf906293648625a91a1f /c/src/lib/libbsp/arm | |
parent | libfs: Fix the warning in the RFS. (diff) | |
download | rtems-be4992b1932b098271ff7bd1141b5265f450f8b1.tar.bz2 |
raspberrypi: Use shared bspreset.c
Diffstat (limited to 'c/src/lib/libbsp/arm')
-rw-r--r-- | c/src/lib/libbsp/arm/csb337/startup/bspreset.c | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c | 35 |
3 files changed, 2 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c b/c/src/lib/libbsp/arm/csb337/startup/bspreset.c index 1167d92df3..940ff7f0e6 100644 --- a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c +++ b/c/src/lib/libbsp/arm/csb337/startup/bspreset.c @@ -17,6 +17,7 @@ void bsp_reset(void) { rtems_interrupt_level level; + (void) level; rtems_interrupt_disable(level); /* Enable the watchdog timer, then wait for the world to end. */ diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index a8d98b4dcf..cda85107f4 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -92,7 +92,7 @@ libbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c # Startup -libbsp_a_SOURCES += startup/bspreset.c +libbsp_a_SOURCES += ../../shared/bspreset_loop.c libbsp_a_SOURCES += startup/bspstart.c # IRQ diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c b/c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c deleted file mode 100644 index 4b3c732c45..0000000000 --- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file - * - * @ingroup arm_start - * - * @brief Raspberry Pi reset code. - */ - -/* - * Copyright (c) 2013 by Alan Cudmore - * Based on work by: - * Copyright (c) 2009 - * embedded brains GmbH - * Obere Lagerstr. 30 - * D-82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * - * http://www.rtems.org/license/LICENSE - * - */ - -#include <rtems.h> - -#include <bsp/bootcard.h> - -void bsp_reset( void) -{ - while (true) { - /* Do nothing */ - } -} |