diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2005-11-04 03:20:29 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2005-11-04 03:20:29 +0000 |
| commit | dc0f6585f52d5aa12b73718c11481948c6f7685f (patch) | |
| tree | 06439dd8efc94e4e5d21dc6cf5b1982d510a5594 | |
| parent | 2005-11-03 <strauman@slac.stanford.edu> (diff) | |
| download | rtems-dc0f6585f52d5aa12b73718c11481948c6f7685f.tar.bz2 | |
2005-11-03 <strauman@slac.stanford.edu>
* shared/console/reboot.c, shared/start/start.S: Fixed PR#845;
!!enable MMU!! on mvme2100 - this is very important.
Otherwise, all accesses are write-back cached [incl. memory-mapped devices].
(Prerequisite were the changes to shared/startup/bspstart.c just
below.) Implemented rtemsReboot() for mvme2100.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/console/reboot.c | 3 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/start/start.S | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/console/reboot.c b/c/src/lib/libbsp/powerpc/shared/console/reboot.c index 2ea5422bd5..cf5e378ef1 100644 --- a/c/src/lib/libbsp/powerpc/shared/console/reboot.c +++ b/c/src/lib/libbsp/powerpc/shared/console/reboot.c @@ -19,4 +19,7 @@ void rtemsReboot(void) #if defined(BSP_KBD_IOBASE) kbd_outb(0x4, 0xFE); /* use keyboard controler to do the job... */ #endif +#if defined(mvme2100) + *(unsigned char*)0xffe00000 |= 0x80; +#endif } /* rtemsReboot */ diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index 58b7debcd8..263774c21e 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -74,20 +74,10 @@ __rtems_entry_point: ori r11,r11,0x1ffe li r8,2 /* R/W access */ isync -#if defined(mvme2100) - /* BSP_vme_config() wants to use BAT0, this board will use the - * available BAT1 to map RAM. - */ - mtspr DBAT1L,r8 /* N.B. 6xx (not 601) have valid */ - mtspr DBAT1U,r11 /* bit in upper BAT register */ - mtspr IBAT1L,r8 - mtspr IBAT1U,r11 -#else mtspr DBAT0L,r8 /* N.B. 6xx (not 601) have valid */ mtspr DBAT0U,r11 /* bit in upper BAT register */ mtspr IBAT0L,r8 mtspr IBAT0U,r11 -#endif isync /* @@ -134,10 +124,6 @@ enter_C_code: MMUon: mfmsr r0 ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 | MSR_FP -#if defined(mvme2100) - /* Data addr translation is broken for the mvme2100, disable it here */ - xori r0,r0, MSR_DR -#endif #if (PPC_HAS_FPU == 0) xori r0, r0, MSR_EE | MSR_IP | MSR_FP #else |