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-i2c
[platform/kernel/u-boot.git]
/
include
/
configs
/
ms7722se.h
diff --git
a/include/configs/ms7722se.h
b/include/configs/ms7722se.h
index
27e9c0a
..
26472e9
100644
(file)
--- a/
include/configs/ms7722se.h
+++ b/
include/configs/ms7722se.h
@@
-15,10
+15,9
@@
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_SDRAM
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_SDRAM
-#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
#define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01"
-#define CONFIG_
VERSION_VARIABLE
+#define CONFIG_
DISPLAY_BOARDINFO
#undef CONFIG_SHOW_BOOT_PROGRESS
/* SMC9111 */
#undef CONFIG_SHOW_BOOT_PROGRESS
/* SMC9111 */
@@
-41,9
+40,6
@@
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF0 1
/* SCIF */
#define CONFIG_SCIF_CONSOLE 1
#define CONFIG_CONS_SCIF0 1
-#undef CONFIG_SYS_CONSOLE_INFO_QUIET /* Suppress display of console information at boot */
-#undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
#define CONFIG_SYS_MEMTEST_START (MS7722SE_SDRAM_BASE)
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))