[rtems commit] bsps: Include <bsp/bootcard.h>
Sebastian Huber
sebh at rtems.org
Wed Nov 14 13:02:43 UTC 2012
Module: rtems
Branch: master
Commit: 3a1d9c6711e2b03d9afa6132b5f976d0e352221a
Changeset: http://git.rtems.org/rtems/commit/?id=3a1d9c6711e2b03d9afa6132b5f976d0e352221a
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Wed Nov 14 11:14:21 2012 +0100
bsps: Include <bsp/bootcard.h>
Use <bsp/bootcard.h> to get prototype for bsp_cleanup(). Fix
bsp_cleanup() definition if necessary.
---
c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c | 2 +-
c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c | 2 +-
c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c | 3 +--
c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c | 3 +--
c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c | 2 +-
c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c | 2 +-
c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c | 7 ++-----
.../lib/libbsp/powerpc/beatnik/startup/bspclean.c | 1 +
.../lib/libbsp/powerpc/virtex4/startup/bspclean.c | 4 ++--
.../lib/libbsp/powerpc/virtex5/startup/bspclean.c | 4 ++--
c/src/lib/libbsp/shared/bspclean.c | 4 +---
11 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c b/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c
index 0cffe0d..75e29ae 100644
--- a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c
+++ b/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c
@@ -9,7 +9,7 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
+#include <bsp/bootcard.h>
#include "../include/system_conf.h"
static void reboot(void)
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c
index ff8b4db..fb53890 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c
@@ -15,8 +15,8 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
#include <bsp.h>
+#include <bsp/bootcard.h>
#include <rtems/bspIo.h>
void __attribute__((weak)) bsp_cleanup(
diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c
index 3dbb106..45966ff 100644
--- a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c
@@ -9,9 +9,8 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
#include <bsp.h>
-#include <rtems/clockdrv.h>
+#include <bsp/bootcard.h>
#include <rtems/zilog/z8036.h>
extern void start( void );
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c
index 8457dd4..7f29f4e 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c
@@ -13,9 +13,8 @@
* May 1996
*/
-#include <rtems.h>
#include <bsp.h>
-#include <rtems/clockdrv.h>
+#include <bsp/bootcard.h>
extern void start( void );
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c
index 6ba44d6..7c25150 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c
@@ -16,8 +16,8 @@
* RTEMS above.
*/
-#include <rtems.h>
#include <bsp.h>
+#include <bsp/bootcard.h>
#include <rtems/zilog/z8036.h>
#include <page_table.h>
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
index c4b36f4..487ad35 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
@@ -14,8 +14,8 @@
* Copyright (c) 1998, National Research Council of Canada
*/
-#include <rtems.h>
#include <bsp.h>
+#include <bsp/bootcard.h>
#include <page_table.h>
extern void start( void );
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c
index f8e0f8e..f9de975 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c
@@ -13,15 +13,12 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
#include <bsp.h>
-#include <rtems/bspIo.h>
-
-extern void bsp_reset(int);
+#include <bsp/bootcard.h>
void bsp_cleanup(
uint32_t status
)
{
- bsp_reset(0);
+ bsp_reset();
}
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c
index 036cbb4..1b63003 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c
@@ -1,4 +1,5 @@
#include <bsp.h>
+#include <bsp/bootcard.h>
#include <rtems/bspIo.h>
void bsp_cleanup(
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c b/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c
index df2d7af..75f95e6 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c
@@ -32,15 +32,15 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
#include <bsp.h>
+#include <bsp/bootcard.h>
static void _noopfun(void) {}
void app_bsp_cleanup(void)
__attribute__(( weak, alias("_noopfun") ));
-void bsp_cleanup( void )
+void bsp_cleanup( uint32_t status )
{
app_bsp_cleanup();
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c b/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c
index df2d7af..75f95e6 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c
@@ -32,15 +32,15 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
#include <bsp.h>
+#include <bsp/bootcard.h>
static void _noopfun(void) {}
void app_bsp_cleanup(void)
__attribute__(( weak, alias("_noopfun") ));
-void bsp_cleanup( void )
+void bsp_cleanup( uint32_t status )
{
app_bsp_cleanup();
diff --git a/c/src/lib/libbsp/shared/bspclean.c b/c/src/lib/libbsp/shared/bspclean.c
index a037e5a..e378d60 100644
--- a/c/src/lib/libbsp/shared/bspclean.c
+++ b/c/src/lib/libbsp/shared/bspclean.c
@@ -9,11 +9,9 @@
* http://www.rtems.com/license/LICENSE.
*/
-#include <rtems.h>
-#include <rtems/bspIo.h>
#include <bsp.h>
-#include <bspopts.h>
#include <bsp/bootcard.h>
+#include <rtems/bspIo.h>
void bsp_cleanup(
uint32_t status
More information about the vc
mailing list