From b6cf80fb50cec18622b9d23e8a5917982f0d53d7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 23 Sep 2008 15:10:33 +0000 Subject: 2008-09-23 Joel Sherrill * Makefile.am, configure.ac: BSP specific bsp_cleanup() is a dupe of a shared one. * startup/bspclean.c: Removed. --- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 6 +++++ c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 4 +-- c/src/lib/libbsp/nios2/nios2_iss/configure.ac | 11 ++++++++ .../lib/libbsp/nios2/nios2_iss/startup/bspclean.c | 31 ---------------------- 4 files changed, 19 insertions(+), 33 deletions(-) delete mode 100644 c/src/lib/libbsp/nios2/nios2_iss/startup/bspclean.c diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index c07a31bf5f..0d76af5809 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,9 @@ +2008-09-23 Joel Sherrill + + * Makefile.am, configure.ac: BSP specific bsp_cleanup() is a dupe of a + shared one. + * startup/bspclean.c: Removed. + 2008-09-18 Joel Sherrill * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 1a9f981668..6c02ddb188 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -29,8 +29,8 @@ project_lib_DATA = start.$(OBJEXT) crtnn.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c startup/bspstart.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bspreset_loop.c ../../shared/bsppost.c startup/bspstart.c \ ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac index cdfbdd9921..455a402626 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/configure.ac +++ b/c/src/lib/libbsp/nios2/nios2_iss/configure.ac @@ -15,6 +15,17 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS +RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[0]) +RTEMS_BSPOPTS_HELP([BSP_PRESS_KEY_FOR_RESET], +[If defined, print a message and wait until pressed before resetting + board when application exits.]) + +RTEMS_BSPOPTS_SET([BSP_RESET_BOARD_AT_EXIT],[*],[1]) +RTEMS_BSPOPTS_HELP([BSP_RESET_BOARD_AT_EXIT], +[If defined, reset the board when the application exits.]) + +RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspclean.c b/c/src/lib/libbsp/nios2/nios2_iss/startup/bspclean.c deleted file mode 100644 index 7d264f8505..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspclean.c +++ /dev/null @@ -1,31 +0,0 @@ -/* bsp_cleanup() - * - * This routine normally is part of start.s and usually returns - * control to a monitor. - * - * INPUT: NONE - * - * OUTPUT: NONE - * - * COPYRIGHT (c) 2005-2006 Kolja Waschk rtemsdev/ixo.de - * Derived from no_cpu/no_bsp/startup/bspclean.c 1.7. - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#include -#include -#include - -void bsp_cleanup( void ) -{ - rtems_interrupt_level level; - rtems_interrupt_disable(level); - for(;;); -} -- cgit v1.2.3