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 remote-tracking branch 'u-boot-atmel/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
P1010RDB.h
diff --git
a/include/configs/P1010RDB.h
b/include/configs/P1010RDB.h
index
08fc4e8
..
57aef21
100644
(file)
--- a/
include/configs/P1010RDB.h
+++ b/
include/configs/P1010RDB.h
@@
-453,7
+453,6
@@
extern unsigned long get_sdram_size(void);
#define CONFIG_NS16550_MIN_FUNCTIONS
#endif
#define CONFIG_NS16550_MIN_FUNCTIONS
#endif
-#define CONFIG_SERIAL_MULTI /* Enable both serial ports */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
#define CONFIG_SYS_BAUDRATE_TABLE \
#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */
#define CONFIG_SYS_BAUDRATE_TABLE \
@@
-464,9
+463,6
@@
extern unsigned long get_sdram_size(void);
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
/* Use the HUSH parser */
#define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
/*
* Pass open firmware flat tree
/*
* Pass open firmware flat tree
@@
-729,9
+725,9
@@
extern unsigned long get_sdram_size(void);
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CONFIG_BAUDRATE 115200
#define CONFIG_EXTRA_ENV_SETTINGS \
- "hwconfig="
MK_STR(CONFIG_DEF_HWCONFIG) "\0"
\
+ "hwconfig="
__stringify(CONFIG_DEF_HWCONFIG) "\0"
\
"netdev=eth0\0" \
"netdev=eth0\0" \
- "uboot="
MK_STR(CONFIG_UBOOTPATH) "\0"
\
+ "uboot="
__stringify(CONFIG_UBOOTPATH) "\0"
\
"loadaddr=1000000\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=2000000\0" \
"loadaddr=1000000\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=2000000\0" \