RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps: Use <bsp/bootcard.h>

Browse Source
This commit is contained in:
Sebastian Huber
2012-12-06 17:40:08 +01:00
parent 191929cd22
commit 40fe4b8627
6 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
View File

@@ -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.

14
c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c
View File

@@ -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 (;;) ;
}

10
c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
View File

@@ -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.

3
c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
View File

@@ -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.

2
c/src/lib/libbsp/m68k/ods68302/startup/cpuboot.c
View File

@@ -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);

4
c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c
View File

@@ -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)
{