From 4b430517637c82de672005494bcb858cb43cc803 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 2 Dec 2013 21:37:29 +0530 Subject: powerpc: motorola: Move bspreset.c to startup/ * Move shared/console/bspreset.c to motorola_powerpc/startup/bspreset.c --- .../libbsp/powerpc/motorola_powerpc/Makefile.am | 4 ++-- .../powerpc/motorola_powerpc/startup/bspreset.c | 27 ++++++++++++++++++++++ c/src/lib/libbsp/powerpc/shared/console/bspreset.c | 27 ---------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bspreset.c delete mode 100644 c/src/lib/libbsp/powerpc/shared/console/bspreset.c diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am index 9a3206d36f..1c829f7b43 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am @@ -52,7 +52,8 @@ libbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \ ../../powerpc/shared/startup/ppc_idle.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \ ../../shared/bspclean.c ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/gnatinstallhandler.c + ../../shared/gnatinstallhandler.c \ + startup/bspreset.c # tod @@ -75,7 +76,6 @@ libbsp_a_SOURCES += \ ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c \ ../../powerpc/shared/console/inch.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/startup/bspreset.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bspreset.c new file mode 100644 index 0000000000..ab21611e21 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bspreset.c @@ -0,0 +1,27 @@ +#include "../../shared/console/console.inl" +#include +#include + +/*-------------------------------------------------------------------------+ +| Function: bsp_reset +| Description: Reboot the PC. +| Global Variables: None. +| Arguments: None. +| Returns: Nothing. ++--------------------------------------------------------------------------*/ +void bsp_reset(void) +{ + printk("Printing a stack trace for your convenience :-)\n"); + CPU_print_stack(); + /* shutdown and reboot */ + +#if defined(mvme2100) + *(unsigned char*)0xffe00000 |= 0x80; +#else + /* Memory-mapped Port 92 PIB device access + *(unsigned char*)0x80000092 |= 0x01; + */ + outb(1, 0x92); + +#endif +} /* bsp_reset */ diff --git a/c/src/lib/libbsp/powerpc/shared/console/bspreset.c b/c/src/lib/libbsp/powerpc/shared/console/bspreset.c deleted file mode 100644 index 2b47458965..0000000000 --- a/c/src/lib/libbsp/powerpc/shared/console/bspreset.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "console.inl" -#include -#include - -/*-------------------------------------------------------------------------+ -| Function: bsp_reset -| Description: Reboot the PC. -| Global Variables: None. -| Arguments: None. -| Returns: Nothing. -+--------------------------------------------------------------------------*/ -void bsp_reset(void) -{ - printk("Printing a stack trace for your convenience :-)\n"); - CPU_print_stack(); - /* shutdown and reboot */ - -#if defined(mvme2100) - *(unsigned char*)0xffe00000 |= 0x80; -#else - /* Memory-mapped Port 92 PIB device access - *(unsigned char*)0x80000092 |= 0x01; - */ - outb(1, 0x92); - -#endif -} /* bsp_reset */ -- cgit v1.2.3