From c3a44343148ff1964e366c5ae96b36b39ff1c856 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 24 Apr 2018 07:41:51 +0200 Subject: bsps: Move bspreset.c to bsps This patch is a part of the BSP source reorganization. Update #3285. --- c/src/lib/libbsp/arm/atsam/Makefile.am | 2 +- c/src/lib/libbsp/arm/lm3s69xx/Makefile.am | 2 +- c/src/lib/libbsp/arm/lpc176x/Makefile.am | 2 +- c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 2 +- .../libbsp/arm/shared/armv7m/startup/bspreset.c | 38 ---------------------- 5 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/shared/armv7m/startup/bspreset.c (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am index dd147951f9..a163d61b82 100644 --- a/c/src/lib/libbsp/arm/atsam/Makefile.am +++ b/c/src/lib/libbsp/arm/atsam/Makefile.am @@ -92,7 +92,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/contrib/libraries/libb # Startup librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S -librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bspreset-armv7m.c librtemsbsp_a_SOURCES += ../shared/armv7m/startup/armv7m-cpucounter.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/bspstart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/bspstarthooks.c diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am index cfdcb79190..2a779c8ccb 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am @@ -41,7 +41,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c # Startup librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S -librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bspreset-armv7m.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/bspstart.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/bspstarthook.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/io.c diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am index 98ba911e49..c62474c43c 100644 --- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am @@ -49,7 +49,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-ch # Startup librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S -librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bspreset-armv7m.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/start/bspstart.c # IRQ diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index e6d78e88ce..bd9384342e 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -59,7 +59,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter # Startup librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S -librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c +librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bspreset-armv7m.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspreset-armv4.c librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspstart.c diff --git a/c/src/lib/libbsp/arm/shared/armv7m/startup/bspreset.c b/c/src/lib/libbsp/arm/shared/armv7m/startup/bspreset.c deleted file mode 100644 index 69b7b85f8c..0000000000 --- a/c/src/lib/libbsp/arm/shared/armv7m/startup/bspreset.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2015 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * 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 -#include - -#include -#include - -#ifdef ARM_MULTILIB_ARCH_V7M - -BSP_START_TEXT_SECTION __attribute__((flatten)) void bsp_reset(void) -{ - rtems_interrupt_level level; - - rtems_interrupt_local_disable(level); - (void) level; - - _ARMV7M_SCB->aircr = ARMV7M_SCB_AIRCR_VECTKEY - | ARMV7M_SCB_AIRCR_SYSRESETREQ; - - while (true) { - /* Do nothing */ - } -} - -#endif /* ARM_MULTILIB_ARCH_V7M */ -- cgit v1.2.3