Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / lwmon5.h

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 7b88ad51d60d895b5ca217369dd84ded5a79b2db..658e359b20fa99f206843ed3bbba24e9298ac42f 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -25,7 +25,6 @@
 
 #define CONFIG_4xx_DCACHE              /* enable cache in SDRAM        */
 
-#define CONFIG_BOARD_EARLY_INIT_F      /* Call board_early_init_f      */
 #define CONFIG_BOARD_EARLY_INIT_R      /* Call board_early_init_r      */
 #define CONFIG_BOARD_POSTCLK_INIT      /* Call board_postclk_init      */
 #define CONFIG_MISC_INIT_R             /* Call misc_init_r             */
@@ -255,7 +254,6 @@
 /* Reserve GPT0_COMP1-COMP5 for logbuffer header */
 #define CONFIG_ALT_LH_ADDR     (CONFIG_SYS_PERIPHERAL_BASE + GPT0_COMP1)
 #define CONFIG_ALT_LB_ADDR     (CONFIG_SYS_OCM_BASE)
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Otherwise it catches logbuffer as output */
 
 /*
  * I2C
@@ -354,17 +352,12 @@
 #define CONFIG_PHY1_ADDR       1
 
 /* Video console */
-#define CONFIG_VIDEO
 #define CONFIG_VIDEO_MB862xx
 #define CONFIG_VIDEO_MB862xx_ACCEL
-#define CONFIG_CFB_CONSOLE
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_CONSOLE_EXTRA_INFO
 #define VIDEO_FB_16BPP_PIXEL_SWAP
 #define VIDEO_FB_16BPP_WORD_SWAP
 
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_VIDEO_SW_CURSOR
 #define CONFIG_SPLASH_SCREEN
 
 /*
@@ -432,8 +425,6 @@
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  /* don't print console @ startup*/
-
 #ifndef DEBUG
 #define CONFIG_HW_WATCHDOG     1       /* Use external HW-Watchdog     */
 #endif