From b23d8953d70ef33d2a7306f2a63619e4afb0a84e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Sep 2008 21:49:23 +0000 Subject: [PATCH] 2008-09-22 Joel Sherrill * Makefile.am, startup/bspstart.c: 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/lpc24xx/ChangeLog | 8 ++++++++ c/src/lib/libbsp/arm/lpc24xx/Makefile.am | 1 + c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog index 4bd675481a..eaa99a05af 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/ChangeLog +++ b/c/src/lib/libbsp/arm/lpc24xx/ChangeLog @@ -1,3 +1,11 @@ +2008-09-22 Joel Sherrill + + * Makefile.am, startup/bspstart.c: 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-22 Joel Sherrill * .cvsignore, include/bspopts.h.in: New files. diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am index f0daadbe0b..c993ff8b56 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am +++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am @@ -51,6 +51,7 @@ dist_project_lib_DATA = ../shared/startup/linkcmds.base \ shared_SOURCES = ../../shared/bootcard.c \ ../../shared/bspclean.c \ + ../../shared/bspreset.c \ ../../shared/bspgetworkarea.c \ ../../shared/bsplibc.c \ ../../shared/bsppost.c \ diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c b/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c index 5317f6560a..5ec46291f3 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c @@ -63,11 +63,6 @@ void bsp_start( void) } } -void bsp_reset( void) -{ - /* Do nothing */ -} - #define ULSR_THRE 0x00000020U static void my_BSP_output_char( char c)