From d8a64319069697a0e8e6f397d2bd6badddf669a5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Sep 2008 21:49:29 +0000 Subject: 2008-09-22 Joel Sherrill * 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. --- c/src/lib/libbsp/arm/smdk2410/ChangeLog | 8 ++++++++ c/src/lib/libbsp/arm/smdk2410/Makefile.am | 3 ++- c/src/lib/libbsp/arm/smdk2410/configure.ac | 9 +++++++++ c/src/lib/libbsp/arm/smdk2410/include/bspopts.h.in | 7 +++++++ 4 files changed, 26 insertions(+), 1 deletion(-) (limited to 'c/src/lib/libbsp/arm/smdk2410') diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog index 88312b3e06..e9da3a35a0 100644 --- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog +++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog @@ -1,3 +1,11 @@ +2008-09-22 Joel Sherrill + + * 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. + 2008-09-21 Joel Sherrill * startup/linkcmds: Move WorkAreaBase to be closer to end definition. diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index 7a562c0ce0..4a31407048 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -26,7 +26,8 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../gp32/startup/bspstart.c ../gp32/startup/bspclean.c startup/memmap.c \ + ../gp32/startup/bspstart.c ../../shared/bspclean.c \ + ../gp32/startup/bspreset.c startup/memmap.c \ ../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bsppretaskinghook.c \ ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ diff --git a/c/src/lib/libbsp/arm/smdk2410/configure.ac b/c/src/lib/libbsp/arm/smdk2410/configure.ac index a802360cdd..568cd06d49 100644 --- a/c/src/lib/libbsp/arm/smdk2410/configure.ac +++ b/c/src/lib/libbsp/arm/smdk2410/configure.ac @@ -18,6 +18,15 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_BSPOPTS_SET([BSP_PRESS_KEY_FOR_RESET],[*],[1]) +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/arm/smdk2410/include/bspopts.h.in b/c/src/lib/libbsp/arm/smdk2410/include/bspopts.h.in index a8a4bcbb38..cb52a8c5d0 100644 --- a/c/src/lib/libbsp/arm/smdk2410/include/bspopts.h.in +++ b/c/src/lib/libbsp/arm/smdk2410/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 -- cgit v1.2.3