[rtems commit] bsps: Use <bsp/bootcard.h>
Sebastian Huber
sebh at rtems.org
Fri Dec 7 08:35:17 UTC 2012
Module: rtems
Branch: master
Commit: 40fe4b8627af067bd45aebc2ea5a24459199d603
Changeset: http://git.rtems.org/rtems/commit/?id=40fe4b8627af067bd45aebc2ea5a24459199d603
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu Dec 6 17:40:08 2012 +0100
bsps: Use <bsp/bootcard.h>
---
c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c | 10 ++++------
c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c | 14 ++++++--------
c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c | 10 ++++------
c/src/lib/libbsp/m68k/mrm332/startup/start_c.c | 3 +--
c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c | 2 +-
c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c | 4 ++--
6 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c b/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
index 77a07ed..0d76e41 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
+++ b/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
@@ -4,17 +4,15 @@
* functions can be called from here.
*/
-#include <stdint.h>
+#include <bsp/bootcard.h>
extern void _wr_vbr(uint32_t);
extern void init_main(void);
-extern int boot_card(const char *);
/*
* From linkcmds
*/
-extern uint8_t _VBR[];
extern uint8_t _INTERRUPT_VECTOR[];
extern uint8_t _clear_start[];
@@ -39,15 +37,15 @@ void Init52235(void)
* Copy the vector table to RAM
*/
- if (_VBR != _INTERRUPT_VECTOR) {
+ if (&_VBR != _INTERRUPT_VECTOR) {
sp = (uint32_t *) _INTERRUPT_VECTOR;
- dp = (uint32_t *) _VBR;
+ dp = (uint32_t *) &_VBR;
for (i = 0; i < 256; i++) {
*dp++ = *sp++;
}
}
- _wr_vbr((uint32_t) _VBR);
+ _wr_vbr((uint32_t) &_VBR);
/*
* Move initialized data from ROM to RAM.
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c b/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c
index bff1446..bc27210 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c
@@ -8,10 +8,9 @@
* functions can be called from here.
*/
-#include <stdint.h>
+#include <bsp/bootcard.h>
extern void _wr_vbr(uint32_t);
-extern int boot_card(int, char **, char **);
extern long _d0_reset,_d1_reset,_M68kSpuriousInterruptCount;
@@ -19,7 +18,6 @@ extern long _d0_reset,_d1_reset,_M68kSpuriousInterruptCount;
* From linkcmds
*/
-extern uint8_t _VBR[];
extern uint8_t _INTERRUPT_VECTOR[];
extern uint8_t _clear_start[];
@@ -39,9 +37,9 @@ void Init5225x(void)
* Copy the vector table to RAM
*/
- if (_VBR != _INTERRUPT_VECTOR) {
+ if (&_VBR != _INTERRUPT_VECTOR) {
sp = (uint32_t *) _INTERRUPT_VECTOR;
- dp = (uint32_t *) _VBR;
+ dp = (uint32_t *) &_VBR;
for (i = 0; i < 256; i++) {
*dp++ = *sp++;
}
@@ -73,13 +71,13 @@ void Init5225x(void)
*sbp++ = 0;
}
-//_wr_vbr((uint32_t) _VBR);
- asm volatile("move.l %0,%%d7;movec %%d7,%%vbr\n\t"::"i"(_VBR): "cc");
+//_wr_vbr((uint32_t) &_VBR);
+ asm volatile("move.l %0,%%d7;movec %%d7,%%vbr\n\t"::"i"(&_VBR): "cc");
/*
* We have to call some kind of RTEMS function here!
*/
- boot_card(0, 0, 0);
+ boot_card(0);
for (;;) ;
}
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c b/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
index 718b433..f85bd51 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
@@ -4,17 +4,15 @@
* functions can be called from here.
*/
-#include <stdint.h>
+#include <bsp/bootcard.h>
extern void _wr_vbr(uint32_t);
extern void init_main(void);
-extern int boot_card(const char *);
/*
* From linkcmds
*/
-extern uint8_t _VBR[];
extern uint8_t _INTERRUPT_VECTOR[];
extern uint8_t _clear_start[];
@@ -39,15 +37,15 @@ void Init5329(void)
* Copy the vector table to RAM
*/
- if (_VBR != _INTERRUPT_VECTOR) {
+ if (&_VBR != _INTERRUPT_VECTOR) {
sp = (uint32_t *) _INTERRUPT_VECTOR;
- dp = (uint32_t *) _VBR;
+ dp = (uint32_t *) &_VBR;
for (i = 0; i < 256; i++) {
*dp++ = *sp++;
}
}
- _wr_vbr((uint32_t) _VBR);
+ _wr_vbr((uint32_t) &_VBR);
/*
* Move initialized data from ROM to RAM.
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
index 819b3ab..c4deda3 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
@@ -18,12 +18,11 @@
#include <rtems/m68k/sim.h>
#define __START_C__
#include "bsp.h"
+#include <bsp/bootcard.h>
rtems_isr_entry M68Kvec[256];
rtems_isr_entry vectors[256];
-void boot_card(const char *cmdline);
-
/*
* This prototype really should have the noreturn attribute but
* that causes a warning. Not sure how to fix that.
diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
index 8e1ff67..2d537fa 100644
--- a/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
+++ b/c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
@@ -31,6 +31,7 @@
/*****************************************************************************/
#include <bsp.h>
+#include <bsp/bootcard.h>
#include <rtems/m68k/m68302.h>
#include <debugport.h>
#include <crc.h>
@@ -117,7 +118,6 @@ void boot_phase_2(void)
static constructors have not been called, and RTEMS is not initialised.
*/
-void boot_card(const char* cmdline);
void set_debug_traps(void);
void breakpoint(void);
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c b/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c
index f43972a..0839db5 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c
+++ b/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c
@@ -1,3 +1,5 @@
+#include <bsp/bootcard.h>
+
static void
__outb(int port, unsigned char v)
{
@@ -31,8 +33,6 @@ extern unsigned char __sbss2_start[], __sbss2_end[];
extern unsigned char __sbss_start[], __sbss_end[];
extern unsigned char __bss_start[], __bss_end[];
-extern void boot_card(void *);
-
void cmain (void)
{
More information about the vc
mailing list