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 branch 'master' of git://git.denx.de/u-boot into master
[platform/kernel/u-boot.git]
/
include
/
configs
/
M5253DEMO.h
diff --git
a/include/configs/M5253DEMO.h
b/include/configs/M5253DEMO.h
index
7a44cf7
..
fe1cca5
100644
(file)
--- a/
include/configs/M5253DEMO.h
+++ b/
include/configs/M5253DEMO.h
@@
-33,7
+33,6
@@
#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#define CONFIG_BAUDRATE 115200
#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
#undef CONFIG_WATCHDOG /* disable watchdog */
#undef CONFIG_WATCHDOG /* disable watchdog */
@@
-88,7
+87,6
@@
# define CONFIG_SYS_ATA_STRIDE 4 /* Interval between registers */
#endif
# define CONFIG_SYS_ATA_STRIDE 4 /* Interval between registers */
#endif
-#define CONFIG_NET_MULTI 1
#define CONFIG_DRIVER_DM9000
#ifdef CONFIG_DRIVER_DM9000
# define CONFIG_DM9000_BASE (CONFIG_SYS_CS1_BASE | 0x300)
#define CONFIG_DRIVER_DM9000
#ifdef CONFIG_DRIVER_DM9000
# define CONFIG_DM9000_BASE (CONFIG_SYS_CS1_BASE | 0x300)
@@
-101,7
+99,7
@@
# define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
# define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
- "inpclk="
MK_STR(CONFIG_SYS_INPUT_CLKSRC) "\0"
\
+ "inpclk="
__stringify(CONFIG_SYS_INPUT_CLKSRC) "\0"
\
"loadaddr=10000\0" \
"u-boot=u-boot.bin\0" \
"load=tftp ${loadaddr) ${u-boot}\0" \
"loadaddr=10000\0" \
"u-boot=u-boot.bin\0" \
"load=tftp ${loadaddr) ${u-boot}\0" \