Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / cpu / mpc8260 / traps.c

diff --git a/cpu/mpc8260/traps.c b/cpu/mpc8260/traps.c
index 693db3908502b5cd5c93c082f81664bcb8591f78..b5d416c9741d87239fdfc592710b0afedb908b66 100644 (file)
--- a/cpu/mpc8260/traps.c
+++ b/cpu/mpc8260/traps.c
@@ -37,7 +37,7 @@
 #include <asm/processor.h>
 #include <asm/m8260_pci.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 int (*debugger_exception_handler)(struct pt_regs *) = 0;
 #endif
 
@@ -58,19 +58,19 @@ print_backtrace(unsigned long *sp)
        int cnt = 0;
        unsigned long i;
 
-       printf("Call backtrace: ");
+       puts ("Call backtrace: ");
        while (sp) {
                if ((uint)sp > END_OF_MEM)
                        break;
 
                i = sp[1];
                if (cnt++ % 7 == 0)
-                       printf("\n");
+                       putc ('\n');
                printf("%08lX ", i);
                if (cnt > 32) break;
                sp = (unsigned long *)*sp;
        }
-       printf("\n");
+       putc ('\n');
 }
 
 void show_regs(struct pt_regs * regs)
@@ -85,7 +85,7 @@ void show_regs(struct pt_regs * regs)
               regs->msr&MSR_IR ? 1 : 0,
               regs->msr&MSR_DR ? 1 : 0);
 
-       printf("\n");
+       putc ('\n');
        for (i = 0;  i < 32;  i++) {
                if ((i % 8) == 0) {
                        printf("GPR%02d: ", i);
@@ -93,7 +93,7 @@ void show_regs(struct pt_regs * regs)
 
                printf("%08lX ", regs->gpr[i]);
                if ((i % 8) == 7) {
-                       printf("\n");
+                       putc ('\n');
                }
        }
 }
@@ -140,7 +140,7 @@ MachineCheckException(struct pt_regs *regs)
        dump_pci();
 #endif
        /* clear the error in the error status register */
-       if(immap->im_pci.pci_esr && cpu_to_le32(PCI_ERROR_PCI_NO_RSP)) {
+       if(immap->im_pci.pci_esr & cpu_to_le32(PCI_ERROR_PCI_NO_RSP)) {
                immap->im_pci.pci_esr = cpu_to_le32(PCI_ERROR_PCI_NO_RSP);
                return;
        }
@@ -150,30 +150,30 @@ MachineCheckException(struct pt_regs *regs)
                return;
        }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        if (debugger_exception_handler && (*debugger_exception_handler)(regs))
                return;
 #endif
 
-       printf("Machine check in kernel mode.\n");
-       printf("Caused by (from msr): ");
+       puts ("Machine check in kernel mode.\n"
+               "Caused by (from msr): ");
        printf("regs %p ",regs);
        switch( regs->msr & 0x000F0000) {
        case (0x80000000>>12):
-               printf("Machine check signal - probably due to mm fault\n"
+               puts ("Machine check signal - probably due to mm fault\n"
                        "with mmu off\n");
                break;
        case (0x80000000>>13):
-               printf("Transfer error ack signal\n");
+               puts ("Transfer error ack signal\n");
                break;
        case (0x80000000>>14):
-               printf("Data parity signal\n");
+               puts ("Data parity signal\n");
                break;
        case (0x80000000>>15):
-               printf("Address parity signal\n");
+               puts ("Address parity signal\n");
                break;
        default:
-               printf("Unknown values in msr\n");
+               puts ("Unknown values in msr\n");
        }
        show_regs(regs);
        print_backtrace((unsigned long *)regs->gpr[1]);
@@ -186,7 +186,7 @@ MachineCheckException(struct pt_regs *regs)
 void
 AlignmentException(struct pt_regs *regs)
 {
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        if (debugger_exception_handler && (*debugger_exception_handler)(regs))
                return;
 #endif
@@ -198,7 +198,7 @@ AlignmentException(struct pt_regs *regs)
 void
 ProgramCheckException(struct pt_regs *regs)
 {
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        if (debugger_exception_handler && (*debugger_exception_handler)(regs))
                return;
 #endif
@@ -210,7 +210,7 @@ ProgramCheckException(struct pt_regs *regs)
 void
 SoftEmuException(struct pt_regs *regs)
 {
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        if (debugger_exception_handler && (*debugger_exception_handler)(regs))
                return;
 #endif
@@ -223,7 +223,7 @@ SoftEmuException(struct pt_regs *regs)
 void
 UnknownException(struct pt_regs *regs)
 {
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
        if (debugger_exception_handler && (*debugger_exception_handler)(regs))
                return;
 #endif
@@ -232,7 +232,7 @@ UnknownException(struct pt_regs *regs)
        _exception(0, regs);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
 extern void do_bedbug_breakpoint(struct pt_regs *);
 #endif
 
@@ -242,7 +242,7 @@ DebugException(struct pt_regs *regs)
 
   printf("Debugger trap at @ %lx\n", regs->nip );
   show_regs(regs);
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
   do_bedbug_breakpoint( regs );
 #endif
 }