From e2f88ab9d6781d4639dd987929b508f59dd200c8 Mon Sep 17 00:00:00 2001 From: Eric Norum Date: Tue, 24 May 2005 01:07:45 +0000 Subject: Try to maintain compatability with everyone else's VBR changes. --- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 5 ----- c/src/lib/libbsp/m68k/uC5282/startup/init5282.c | 5 ----- c/src/lib/libbsp/m68k/uC5282/startup/linkcmds | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 4d5f83831a..d2e74c1c3b 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2005-05-23 Eric Norum + + * startup/linkcmds + startup/bspstart.c: Followup fix to Joel's/Chris's VBR changes. + 2005-05-11 Eric Norum * startup/bspstart.c: Followup fix to Joel's changes of 2005-05-03. diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 4a490636b4..b3c11c7cf5 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -43,11 +43,6 @@ char *rtems_progname; #define VME_ONE_BASE 0x30000000 #define VME_TWO_BASE 0x31000000 -/* - * Read/write copy of vector-base register - */ -void *_VBR; - /* * CPU-space access * The NOP after writing the CACR is there to address the following issue as diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c b/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c index 95bbfb46a2..d59268c49c 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c @@ -18,11 +18,6 @@ void Init5282 (void) { extern void CopyDataClearBSSAndStart (void); - /* - * Set the VBR to point to where the assembly code copied it - */ - m68k_set_vbr(0); - /* * Copy data, clear BSS and call boot_card() */ diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds index d67b273fab..68f3057b68 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds @@ -36,6 +36,7 @@ _CPUClockSpeed = DEFINED(_CPUClockSpeed) ? _CPUClockSpeed : 64000000 ; */ __IPSBAR = DEFINED(__IPSBAR) ? __IPSBAR : 0x40000000 ; __SRAMBASE = DEFINED(__SRAMBASE) ? __SRAMBASE : 0x20000000 ; +_VBR = 0x0; ENTRY(start) MEMORY -- cgit v1.2.3