diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:29 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:29 +0000 |
| commit | 87a38dd39f97b0ecf616309ca2506294f51d1ad1 (patch) | |
| tree | 03693dfdb8e08edc49d3746ba48c0f307339d7f0 /c | |
| parent | 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-87a38dd39f97b0ecf616309ca2506294f51d1ad1.tar.bz2 | |
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, include/bspopts.h.in: Use standardized
bsp_cleanup() which can optionally print a message, poll for user to
press key, and call bsp_reset(). Using this eliminates the various
bsp_cleanup() implementations which had their own implementation and
variety of string constants.
* startup/bspclean.c: Removed.
Diffstat (limited to 'c')
20 files changed, 110 insertions, 178 deletions
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index fe2386d73c..5c3af0cdc5 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bspopts.h.in: Use standardized + bsp_cleanup() which can optionally print a message, poll for user to + press key, and call bsp_reset(). Using this eliminates the various + bsp_cleanup() implementations which had their own implementation and + variety of string constants. + * startup/bspclean.c: Removed. + 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index 69b9e69d8c..3a3737223c 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -25,11 +25,11 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bspgetworkarea.c \ - ../../shared/bsppretaskinghook.c ../../shared/bsppredriverhook.c \ - startup/init548x.c startup/bspstart.c ../../shared/bootcard.c \ - ../../shared/sbrk.c ../../m68k/shared/setvec.c \ + ../../shared/bspreset_loop.c ../../shared/bsppretaskinghook.c \ + ../../shared/bsppredriverhook.c startup/init548x.c startup/bspstart.c \ + ../../shared/bootcard.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/clock.c console_SOURCES = console/console.c diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac index aed3023a57..577727ccdc 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac +++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac @@ -24,6 +24,15 @@ RTEMS_BSPOPTS_SET([BSP_CPU_CLOCK_SPEED],[*],[100000000]) RTEMS_BSPOPTS_HELP([BSP_CPU_CLOCK_SPEED], [Use a clock speed of 100000000 for the m5484FireEngine board]) +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 diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bspopts.h.in b/c/src/lib/libbsp/m68k/genmcf548x/include/bspopts.h.in index 6af0def974..a53707dbad 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/include/bspopts.h.in +++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bspopts.h.in @@ -11,6 +11,13 @@ starts set to zero. */ #undef BSP_DIRTY_MEMORY +/* If defined, print a message and wait until pressed before resetting board + when application exits. */ +#undef BSP_PRESS_KEY_FOR_RESET + +/* If defined, reset the board when the application exits. */ +#undef BSP_RESET_BOARD_AT_EXIT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspclean.c b/c/src/lib/libbsp/m68k/genmcf548x/startup/bspclean.c deleted file mode 100644 index 87aeef194c..0000000000 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspclean.c +++ /dev/null @@ -1,60 +0,0 @@ -/*===============================================================*\ -| Project: RTEMS generic mcf548x BSP | -+-----------------------------------------------------------------+ -| File: bspclean.c | -+-----------------------------------------------------------------+ -| The file contains the BSP cleanup code of the generic MCF548x | -| BSP. | -+-----------------------------------------------------------------+ -| Copyright (c) 2007 | -| Embedded Brains GmbH | -| Obere Lagerstr. 30 | -| D-82178 Puchheim | -| Germany | -| rtems@embedded-brains.de | -+-----------------------------------------------------------------+ -| | -| Parts of the code has been derived from the "dBUG source code" | -| package Freescale is providing for M548X EVBs. The usage of | -| the modified or unmodified code and it's integration into the | -| generic mcf548x BSP has been done according to the Freescale | -| license terms. | -| | -| The Freescale license terms can be reviewed in the file | -| | -| Freescale_license.txt | -| | -+-----------------------------------------------------------------+ -| | -| The generic mcf548x BSP has been developed on the basic | -| structures and modules of the av5282 BSP. | -| | -+-----------------------------------------------------------------+ -| | -| 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. | -| | -+-----------------------------------------------------------------+ -| | -| date history ID | -| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | -| 12.11.07 1.0 ras | -| | -\*===============================================================*/ - -#include <rtems.h> -#include <bsp.h> -#include <rtems/bspIo.h> - -void bsp_cleanup( void ) -{ - printk("\nRTEMS exited!\n"); - for ( ;; ) - { - asm volatile ( " nop " ); - asm volatile ( " nop " ); - } - -} diff --git a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog index e3429e4a80..31a2057027 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf52235/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bspopts.h.in: Use standardized + bsp_cleanup() which can optionally print a message, poll for user to + press key, and call bsp_reset(). Using this eliminates the various + bsp_cleanup() implementations which had their own implementation and + variety of string constants. + * startup/bspclean.c: Removed. + 2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am: Split out bspstart contents. Move cache code to libcpu. diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am index 3b3005b82c..2416c0199b 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am @@ -25,8 +25,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ + ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ startup/init52235.c ../../shared/bspstart.c startup/cfinit.c \ startup/bspgetcpuclockspeed.c ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/mcf52235/configure.ac b/c/src/lib/libbsp/m68k/mcf52235/configure.ac index 86b315578c..98907f27cf 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf52235/configure.ac @@ -20,6 +20,15 @@ RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION #RTEMS_CHECK_NETWORKING #AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +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 diff --git a/c/src/lib/libbsp/m68k/mcf52235/include/bspopts.h.in b/c/src/lib/libbsp/m68k/mcf52235/include/bspopts.h.in index a8a4bcbb38..cb52a8c5d0 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/include/bspopts.h.in +++ b/c/src/lib/libbsp/m68k/mcf52235/include/bspopts.h.in @@ -8,6 +8,13 @@ starts set to zero. */ #undef BSP_DIRTY_MEMORY +/* If defined, print a message and wait until pressed before resetting board + when application exits. */ +#undef BSP_PRESS_KEY_FOR_RESET + +/* If defined, reset the board when the application exits. */ +#undef BSP_RESET_BOARD_AT_EXIT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf52235/startup/bspclean.c deleted file mode 100644 index 75d0a0c569..0000000000 --- a/c/src/lib/libbsp/m68k/mcf52235/startup/bspclean.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SBC5206 bsp_cleanup - * - * This routine returns control from RTEMS to the monitor. - * - * Author: - * David Fiddes, D.J@fiddes.surfaid.org - * http://www.calm.hw.ac.uk/davidf/coldfire/ - * - * COPYRIGHT (c) 1989-1998. - * 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 <rtems.h> -#include <bsp.h> -#include <rtems/bspIo.h> - -void bsp_cleanup(void) -{ - printk("\nRTEMS exited!\n"); - for (;;) { - asm volatile (" nop "); - asm volatile (" nop "); - } -} diff --git a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog index a0319c1c94..1fe53afb59 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5329/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bspopts.h.in: Use standardized + bsp_cleanup() which can optionally print a message, poll for user to + press key, and call bsp_reset(). Using this eliminates the various + bsp_cleanup() implementations which had their own implementation and + variety of string constants. + * startup/bspclean.c: Removed. + 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am index ff9c049943..16552c3f72 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am @@ -25,8 +25,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash -startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bsppredriverhook.c \ + ../../shared/bsplibc.c ../../shared/bsppost.c ../../shared/bspreset_loop.c \ ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ startup/init5329.c startup/bspstart.c startup/cfinit.c\ ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5329/configure.ac b/c/src/lib/libbsp/m68k/mcf5329/configure.ac index 9d689e9bc9..543eb6d638 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5329/configure.ac @@ -20,6 +20,15 @@ RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +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 diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bspopts.h.in b/c/src/lib/libbsp/m68k/mcf5329/include/bspopts.h.in index a8a4bcbb38..cb52a8c5d0 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/include/bspopts.h.in +++ b/c/src/lib/libbsp/m68k/mcf5329/include/bspopts.h.in @@ -8,6 +8,13 @@ starts set to zero. */ #undef BSP_DIRTY_MEMORY +/* If defined, print a message and wait until pressed before resetting board + when application exits. */ +#undef BSP_PRESS_KEY_FOR_RESET + +/* If defined, reset the board when the application exits. */ +#undef BSP_RESET_BOARD_AT_EXIT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5329/startup/bspclean.c deleted file mode 100644 index 0a51e87e49..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5329/startup/bspclean.c +++ /dev/null @@ -1,33 +0,0 @@ - -/* - * SBC5206 bsp_cleanup - * - * This routine returns control from RTEMS to the monitor. - * - * Author: - * David Fiddes, D.J@fiddes.surfaid.org - * http://www.calm.hw.ac.uk/davidf/coldfire/ - * - * COPYRIGHT (c) 1989-1998. - * 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 <rtems.h> -#include <bsp.h> -#include <rtems/bspIo.h> - -void bsp_cleanup(void) -{ - printk("\nRTEMS exited!\n"); - for (;;) { - asm volatile (" nop "); - asm volatile (" nop "); - } -} diff --git a/c/src/lib/libbsp/powerpc/virtex/ChangeLog b/c/src/lib/libbsp/powerpc/virtex/ChangeLog index fb9afb8253..e83788b07d 100644 --- a/c/src/lib/libbsp/powerpc/virtex/ChangeLog +++ b/c/src/lib/libbsp/powerpc/virtex/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bspopts.h.in: Use standardized + bsp_cleanup() which can optionally print a message, poll for user to + press key, and call bsp_reset(). Using this eliminates the various + bsp_cleanup() implementations which had their own implementation and + variety of string constants. + * startup/bspclean.c: Removed. + 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Remove unnecessary boilerplate comments. diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am index da6841fb78..6d1a4d1973 100644 --- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am +++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am @@ -32,8 +32,8 @@ project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -startup_SOURCES = startup/bspclean.c ../../shared/bspgetworkarea.c \ - ../../shared/bsplibc.c \ +startup_SOURCES = ../../shared/bspclean.c ../../shared/bspgetworkarea.c \ + ../../shared/bspreset_fatal.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ ../../shared/sbrk.c startup/setvec.c \ diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac index 756b9ed985..06faece213 100644 --- a/c/src/lib/libbsp/powerpc/virtex/configure.ac +++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac @@ -41,6 +41,15 @@ RTEMS_BSPOPTS_SET([RTEMS_XPPC_BASE],[*],[.]) RTEMS_BSPOPTS_HELP([RTEMS_XPPC_BASE],[Defines path to Xilinx XPS PPC libraries.]) #RSG End +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 diff --git a/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in b/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in index 49d87815f8..c6336f3b18 100644 --- a/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in +++ b/c/src/lib/libbsp/powerpc/virtex/include/bspopts.h.in @@ -8,6 +8,13 @@ starts set to zero. */ #undef BSP_DIRTY_MEMORY +/* If defined, print a message and wait until pressed before resetting board + when application exits. */ +#undef BSP_PRESS_KEY_FOR_RESET + +/* If defined, reset the board when the application exits. */ +#undef BSP_RESET_BOARD_AT_EXIT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspclean.c b/c/src/lib/libbsp/powerpc/virtex/startup/bspclean.c deleted file mode 100644 index 56699da354..0000000000 --- a/c/src/lib/libbsp/powerpc/virtex/startup/bspclean.c +++ /dev/null @@ -1,43 +0,0 @@ -/* bsp_cleanup() - * - * This routine normally is part of start.s and usually returns - * control to a monitor. - * - * INPUT: NONE - * - * OUTPUT: NONE - * - * Author: Andrew Bray <andy@i-cubed.co.uk> - * - * COPYRIGHT (c) 1995 by i-cubed ltd. - * - * To anyone who acknowledges that this file is provided "AS IS" - * without any express or implied warranty: - * permission to use, copy, modify, and distribute this file - * for any purpose is hereby granted without fee, provided that - * the above copyright notice and this notice appears in all - * copies, and that the name of i-cubed limited not be used in - * advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * i-cubed limited makes no representations about the suitability - * of this software for any purpose. - * - * Derived from c/src/lib/libbsp/no_cpu/no_bsp/startup/bspclean.c: - * - * 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 <rtems.h> -#include <bsp.h> - -void bsp_cleanup( void ) -{ - rtems_fatal_error_occurred(0); -} |