There are two places in the cfb_console driver that test whether
CONFIG_VGA_AS_SINGLE_DEVICE is defined or not, but actually it is
unnecessary, hence clean it up.
Signed-off-by: Bin Meng <bmeng...@gmail.com>
---
drivers/video/cfb_console.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index f4231b8..fcaaa7f 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -2274,9 +2274,7 @@ int drv_video_init(void)
#endif
if (have_keyboard) {
debug("KBD: Keyboard init ...\n");
-#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
skip_dev_init |= (VIDEO_KBD_INIT_FCT == -1);
-#endif
}
if (skip_dev_init)
return 0;
@@ -2289,14 +2287,12 @@ int drv_video_init(void)
console_dev.putc = video_putc; /* 'putc' function */
console_dev.puts = video_puts; /* 'puts' function */
-#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
if (have_keyboard) {
/* Also init console device */
console_dev.flags |= DEV_FLAGS_INPUT;
console_dev.tstc = VIDEO_TSTC_FCT; /* 'tstc' function */
console_dev.getc = VIDEO_GETC_FCT; /* 'getc' function */
}
-#endif
if (stdio_register(&console_dev) != 0)
return 0;
--
1.8.2.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
