diff options
author | wdenk <wdenk> | 2004-02-23 22:22:28 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-02-23 22:22:28 +0000 |
commit | 63e73c9a8ed5b32d9c4067ffaad953e9a8fe8f0a (patch) | |
tree | 2f8915e0b3024c639748e930b56d60c0d8cf2d99 /cpu/mpc5xxx | |
parent | cd0a9de68b03e5a54fd2a08f44be318e4397be01 (diff) |
* Patches by Reinhard Meyer, 14 Feb 2004:
- update board/emk tree; use common flash driver
- Corrected tested bits in machine check exception in cpu/mpc5xxx/traps.c
[adapted for other PPC CPUs -- wd]
- Added support for the M48T08 on the EVAL5200 board in rtc/mk48t59.c
* Patch by Jon Diekema, 13 Feb 2004:
Call show_boot_progress() whenever POST "FAILED" is printed.
* Patch by Nishant Kamat, 13 Feb 2004:
Add support for TI OMAP1610 H2 Board
Fixes for cpu/arm926ejs/interrupt.c
(based on Richard Woodruff's patch for arm925, 16 Oct 03)
Fix for a timer bug in OMAP1610 Innovator
Add support for CS0 (ROM)/CS3 (Flash) boot in OMAP1610 Innovator and H2
* Patches by Stephan Linz, 12 Feb 2004:
- add support for NIOS timer with variable period preload counter value
- prepare POST framework support for NIOS targets
* Patch by Denis Peter, 11 Feb 2004:
add POST support for the MIP405 board
Diffstat (limited to 'cpu/mpc5xxx')
-rw-r--r-- | cpu/mpc5xxx/traps.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpu/mpc5xxx/traps.c b/cpu/mpc5xxx/traps.c index 5d43394523..2ee782b9c8 100644 --- a/cpu/mpc5xxx/traps.c +++ b/cpu/mpc5xxx/traps.c @@ -5,6 +5,7 @@ * * Modified by Cort Dougan (cort@cs.nmt.edu) * and Paul Mackerras (paulus@cs.anu.edu.au) + * fixed Machine Check Reasons by Reinhard Meyer (r.meyer@emk-elektronik.de) * * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. @@ -130,19 +131,20 @@ MachineCheckException(struct pt_regs *regs) printf("Machine check in kernel mode.\n"); printf("Caused by (from msr): "); printf("regs %p ",regs); - switch( regs->msr & 0x0000F000) + /* refer to 603e Manual (MPC603EUM/AD), chapter 4.5.2.1 */ + switch( regs->msr & 0x000F0000) { - case (1<<12) : + case (0x80000000>>12) : printf("Machine check signal - probably due to mm fault\n" "with mmu off\n"); break; - case (1<<13) : + case (0x80000000>>13) : printf("Transfer error ack signal\n"); break; - case (1<<14) : + case (0x80000000>>14) : printf("Data parity signal\n"); break; - case (1<<15) : + case (0x80000000>>15) : printf("Address parity signal\n"); break; default: |