From ddfaa29626df1b58a219caeff472b186ed1d5b7b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Sep 2008 21:50:21 +0000 Subject: [PATCH] 2008-09-22 Joel Sherrill * Makefile.am, include/bsp.h: 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/powerpc/motorola_powerpc/ChangeLog | 8 ++++++++ c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog index 549360e003..ad5edd2657 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog @@ -1,3 +1,11 @@ +2008-09-22 Joel Sherrill + + * Makefile.am, include/bsp.h: 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-15 Joel Sherrill * include/bsp.h: Add use of bsp_get_work_area() in its own file and diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 86c3dab9ec..c35fd3bf2b 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -71,7 +71,7 @@ console_SOURCES = \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/inch.c \ - ../../powerpc/shared/console/reboot.c \ + ../../powerpc/shared/console/bspreset.c \ ../../powerpc/shared/console/consoleIo.h \ ../../powerpc/shared/console/keyboard.h \ ../../powerpc/shared/console/uart.h diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h index c9e5a6f34f..5368016cd7 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h @@ -192,7 +192,6 @@ extern char *BSP_commandline_string; ((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value))) extern void BSP_panic(char *s); -extern void rtemsReboot(void); /* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */ extern int BSP_disconnect_clock_handler (void); extern int BSP_connect_clock_handler (void);