Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / MigoR.h

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index a4eabe5..75c5af6 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -9,7 +9,6 @@
 #ifndef __MIGO_R_H
 #define __MIGO_R_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7722      1
 #define CONFIG_MIGO_R          1
 
@@ -18,6 +17,7 @@
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC0,115200 root=1f01"
 
+#define CONFIG_DISPLAY_BOARDINFO
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9111 */
@@ -40,10 +40,6 @@
 /* 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       (MIGO_R_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))