diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:40 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-22 21:50:40 +0000 |
commit | 17623751c4e0631498dd6a6ae3e055e4375b5c92 (patch) | |
tree | d4926b6c847a24801076a5a5098dca4d3fb8fba2 /c/src/lib/libbsp/m68k | |
parent | 2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-17623751c4e0631498dd6a6ae3e055e4375b5c92.tar.bz2 |
2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac: 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/src/lib/libbsp/m68k')
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/configure.ac | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/bspclean.c | 34 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/configure.ac | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/bspclean.c | 34 |
8 files changed, 40 insertions, 72 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 84628e6f35..d5d2ac605d 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac: 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/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 9697f5335b..3f8b8506e4 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/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/init5282.c startup/bspstart.c \ ../../shared/bootcard.c \ diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac index d11df33e42..c128ff9f08 100644 --- a/c/src/lib/libbsp/m68k/av5282/configure.ac +++ b/c/src/lib/libbsp/m68k/av5282/configure.ac @@ -19,6 +19,15 @@ 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/av5282/startup/bspclean.c b/c/src/lib/libbsp/m68k/av5282/startup/bspclean.c deleted file mode 100644 index 7bddc13392..0000000000 --- a/c/src/lib/libbsp/m68k/av5282/startup/bspclean.c +++ /dev/null @@ -1,34 +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/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index b17d627b81..f478bf7f2e 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog @@ -1,3 +1,12 @@ +2008-09-22 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac: 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, startup/bspstart.c: Split out bspstart contents. Move diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 737bde8a50..bfb9a42efb 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -26,8 +26,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \ startup/linkcmdsram -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 \ startup/bspgetcpuclockspeed.c ../../shared/bsppretaskinghook.c \ ../../shared/bspgetworkarea.c startup/init5235.c startup/bspstart.c \ ../../shared/bootcard.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac index b89e18b355..79bfa4cb8f 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac @@ -21,6 +21,15 @@ 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/mcf5235/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5235/startup/bspclean.c deleted file mode 100644 index 7bddc13392..0000000000 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspclean.c +++ /dev/null @@ -1,34 +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 " ); - } - -} |