RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

raspberrypi: Use shared bspreset.c

Browse Source
This commit is contained in:
Joel Sherrill
2014-09-02 18:00:44 -05:00
parent 5f9c208084
commit be4992b193
4 changed files with 34 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/arm/csb337/startup/bspreset.c
View File

@@ -17,6 +17,7 @@ void bsp_reset(void)
{ {
rtems_interrupt_level level; rtems_interrupt_level level;
(void) level;
rtems_interrupt_disable(level); rtems_interrupt_disable(level);
/* Enable the watchdog timer, then wait for the world to end. */ /* Enable the watchdog timer, then wait for the world to end. */

2
c/src/lib/libbsp/arm/raspberrypi/Makefile.am
View File

@@ -92,7 +92,7 @@ libbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c libbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
# Startup # Startup
libbsp_a_SOURCES += startup/bspreset.c libbsp_a_SOURCES += ../../shared/bspreset_loop.c
libbsp_a_SOURCES += startup/bspstart.c libbsp_a_SOURCES += startup/bspstart.c
# IRQ # IRQ

35
c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c
View File

@@ -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 */
}
}

11
testsuites/sptests/spintr_err01/init.c
View File

@@ -20,11 +20,8 @@ rtems_task Init(
rtems_task_argument argument rtems_task_argument argument
) )
{ {
rtems_status_code status;
TEST_BEGIN(); TEST_BEGIN();
#if ((CPU_SIMPLE_VECTORED_INTERRUPTS == FALSE) || \ #if (CPU_SIMPLE_VECTORED_INTERRUPTS == FALSE)
defined(_C3x) || defined(_C4x))
puts( puts(
"TA1 - rtems_interrupt_catch - " "TA1 - rtems_interrupt_catch - "
"bad handler RTEMS_INVALID_ADDRESS -- SKIPPED" "bad handler RTEMS_INVALID_ADDRESS -- SKIPPED"
@@ -32,7 +29,9 @@ rtems_task Init(
puts( puts(
"TA1 - rtems_interrupt_catch - " "TA1 - rtems_interrupt_catch - "
"old isr RTEMS_INVALID_ADDRESS - SKIPPED" ); "old isr RTEMS_INVALID_ADDRESS - SKIPPED" );
#else #else
rtems_status_code status;
rtems_isr_entry old_service_routine; rtems_isr_entry old_service_routine;
status = rtems_interrupt_catch( status = rtems_interrupt_catch(
Service_routine, Service_routine,
@@ -61,7 +60,7 @@ rtems_task Init(
"rtems_interrupt_catch with invalid old isr pointer" "rtems_interrupt_catch with invalid old isr pointer"
); );
puts( "TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS" ); puts( "TA1 - rtems_interrupt_catch - old isr RTEMS_INVALID_ADDRESS" );
#endif #endif
TEST_END(); TEST_END();
} }