projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
cpu
/
mpc8260
/
bedbug_603e.c
diff --git
a/cpu/mpc8260/bedbug_603e.c
b/cpu/mpc8260/bedbug_603e.c
index
9c29b35
..
f1be485
100644
(file)
--- a/
cpu/mpc8260/bedbug_603e.c
+++ b/
cpu/mpc8260/bedbug_603e.c
@@
-10,7
+10,8
@@
#include <bedbug/regs.h>
#include <bedbug/ppc.h>
#include <bedbug/regs.h>
#include <bedbug/ppc.h>
-#if (CONFIG_COMMANDS & CFG_CMD_BEDBUG) && (defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260))
+#if defined(CONFIG_CMD_BEDBUG) \
+ && (defined(CONFIG_MPC824X) || defined(CONFIG_MPC8260))
#define MAX_BREAK_POINTS 1
#define MAX_BREAK_POINTS 1
@@
-81,7
+82,7
@@
void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
{
if( bug_ctx.hw_debug_enabled == 0 )
{
{
if( bug_ctx.hw_debug_enabled == 0 )
{
- p
rintf
( "No breakpoints enabled\n" );
+ p
uts
( "No breakpoints enabled\n" );
return;
}
return;
}
@@
-105,7
+106,7
@@
void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
printf( "Breakpoint [%d]: ", which_bp );
if( (addr & 0x00000002) == 0 )
printf( "Breakpoint [%d]: ", which_bp );
if( (addr & 0x00000002) == 0 )
- p
rintf
( "NOT SET\n" );
+ p
uts
( "NOT SET\n" );
else
disppc( (unsigned char *)(addr & 0xFFFFFFFC), 0, 1, bedbug_puts, F_RADHEX );
}
else
disppc( (unsigned char *)(addr & 0xFFFFFFFC), 0, 1, bedbug_puts, F_RADHEX );
}
@@
-183,7
+184,7
@@
int bedbug603e_set( int which_bp, unsigned long addr )
if(( addr & 0x00000003 ) != 0 )
{
if(( addr & 0x00000003 ) != 0 )
{
- p
rintf
( "Breakpoints must be on a 32 bit boundary\n" );
+ p
uts
( "Breakpoints must be on a 32 bit boundary\n" );
return 0;
}
return 0;
}
@@
-191,7
+192,7
@@
int bedbug603e_set( int which_bp, unsigned long addr )
if(( bug_ctx.find_empty ) && ( !which_bp ) &&
( which_bp = (*bug_ctx.find_empty)()) == 0 )
{
if(( bug_ctx.find_empty ) && ( !which_bp ) &&
( which_bp = (*bug_ctx.find_empty)()) == 0 )
{
- p
rintf
( "All breakpoints in use\n" );
+ p
uts
( "All breakpoints in use\n" );
return 0;
}
return 0;
}