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]
/
board
/
xilinx
/
ml300
/
serial.c
diff --git
a/board/xilinx/ml300/serial.c
b/board/xilinx/ml300/serial.c
index
c204b88
..
ba41f85
100644
(file)
--- a/
board/xilinx/ml300/serial.c
+++ b/
board/xilinx/ml300/serial.c
@@
-40,8
+40,7
@@
#include <asm/processor.h>
#include <common.h>
#include <command.h>
#include <asm/processor.h>
#include <common.h>
#include <command.h>
-#include <configs/ml300.h>
-#include "xparameters.h"
+#include <config.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
@@
-123,7
+122,7
@@
serial_puts(const char *s)
}
}
}
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_KGDB)
+#if
defined(CONFI
G_CMD_KGDB)
void
kgdb_serial_init(void)
{
void
kgdb_serial_init(void)
{
@@
-152,4
+151,4
@@
kgdb_interruptible(int yes)
{
return;
}
{
return;
}
-#endif
/* CFG_CMD_KGDB */
+#endif