projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
traps.c
diff --git
a/cpu/mpc8260/traps.c
b/cpu/mpc8260/traps.c
index 07be0fac6de3363eab7ebcb2fe31504b27574784..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>
#include <asm/processor.h>
#include <asm/m8260_pci.h>
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif
int (*debugger_exception_handler)(struct pt_regs *) = 0;
#endif
@@
-150,7
+150,7
@@
MachineCheckException(struct pt_regs *regs)
return;
}
return;
}
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-186,7
+186,7
@@
MachineCheckException(struct pt_regs *regs)
void
AlignmentException(struct pt_regs *regs)
{
void
AlignmentException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
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)
{
void
ProgramCheckException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
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)
{
void
SoftEmuException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
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)
{
void
UnknownException(struct pt_regs *regs)
{
-#if
(CONFIG_COMMANDS & CFG_CMD_KGDB) ||
defined(CONFIG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
@@
-232,7
+232,7
@@
UnknownException(struct pt_regs *regs)
_exception(0, regs);
}
_exception(0, regs);
}
-#if
(CONFIG_COMMANDS & CFG_CMD_BEDBUG) ||
defined(CONFIG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint(struct pt_regs *);
#endif
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);
printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs);
-#if
(CONFIG_COMMANDS & CFG_CMD_BEDBUG) ||
defined(CONFIG_CMD_BEDBUG)
+#if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint( regs );
#endif
}
do_bedbug_breakpoint( regs );
#endif
}