This converts the following to Kconfig: CONFIG_CONSOLE_EXTRA_INFO
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Tom Rini trini@konsulko.com ---
Changes in v4: None Changes in v3: None Changes in v2: None
configs/MIP405T_defconfig | 1 + configs/MIP405_defconfig | 1 + configs/MiniFAP_defconfig | 1 + configs/PIP405_defconfig | 1 + configs/TQM5200_B_HIGHBOOT_defconfig | 1 + configs/TQM5200_B_defconfig | 1 + configs/TQM5200_STK100_defconfig | 1 + configs/TQM5200_defconfig | 1 + configs/charon_defconfig | 1 + configs/icon_defconfig | 1 + configs/ipek01_defconfig | 1 + configs/lwmon5_defconfig | 1 + configs/socrates_defconfig | 1 + drivers/video/Kconfig | 10 ++++++++++ include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/TQM5200.h | 1 - include/configs/icon.h | 1 - include/configs/ipek01.h | 1 - include/configs/lwmon5.h | 1 - include/configs/socrates.h | 1 - scripts/config_whitelist.txt | 1 - 22 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index ddc5c36..1d72a74 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -15,4 +15,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_VIDEO_CT69000=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 2610899..91d5db8 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -18,4 +18,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_VIDEO_CT69000=y diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 31602ab..e426cd1 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index 73ed894..939c58f 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -18,4 +18,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_VIDEO_CT69000=y diff --git a/configs/TQM5200_B_HIGHBOOT_defconfig b/configs/TQM5200_B_HIGHBOOT_defconfig index cdba626..085e4f2 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index ddd356b..54ae558 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 541a37a..5ee99e3 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index 1d31439..faf5802 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/charon_defconfig b/configs/charon_defconfig index a7e60b7..5c8b949 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/icon_defconfig b/configs/icon_defconfig index 78a9a76..e415ac5 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -19,4 +19,5 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig index ee36fab..d81d95c 100644 --- a/configs/ipek01_defconfig +++ b/configs/ipek01_defconfig @@ -14,4 +14,5 @@ CONFIG_CMD_MII=y CONFIG_CMD_FAT=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig index a2259b4..0282d28 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -21,4 +21,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index 372918f..867db13 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_EXT2=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 42db0ad..83dc5c8 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -503,6 +503,16 @@ config VGA_AS_SINGLE_DEVICE may be used if you have no keyboard device, or more than one (USB Keyboard, AT Keyboard).
+config CONSOLE_EXTRA_INFO + bool "Display additional board information" + depends on CFB_CONSOLE + help + Display additional board information strings that normally go to + the serial port. When this option is enabled, a board-specific + function video_get_info_str() is called to get the string for + each line of the display. The function should return the string, + which can be empty if there is nothing to display for that line. + config VIDEO_CT69000 bool "Enable Chips & Technologies 69000 video driver" depends on VIDEO diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 257fa47..43468ef 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -343,7 +343,6 @@ * Video support ************************************************************/ #define CONFIG_VIDEO_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #undef CONFIG_VIDEO_ONBOARD /************************************************************ * USB support EXPERIMENTAL diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 70e75c1..685922c 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -303,7 +303,6 @@ * Video support ************************************************************/ #define CONFIG_VIDEO_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #define CONFIG_VIDEO_ONBOARD /* Video controller is on-board */
/************************************************************ diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 20a0575..1160a97 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -102,7 +102,6 @@ #define CONFIG_VIDEO_LOGO
#ifndef CONFIG_FO300 -#define CONFIG_CONSOLE_EXTRA_INFO #else #define CONFIG_VIDEO_BMP_LOGO #endif diff --git a/include/configs/icon.h b/include/configs/icon.h index 3a72a66..c60df49 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -133,7 +133,6 @@ #define CONFIG_VIDEO_SM501_PCI #define VIDEO_FB_LITTLE_ENDIAN #define CONFIG_VIDEO_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CFG_CONSOLE_IS_IN_ENV diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 7fcfb73..2de8e2e 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -49,7 +49,6 @@ #define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20) /* decompressed img */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 2e89b1a..2fed3e0 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -356,7 +356,6 @@ #define CONFIG_VIDEO_MB862xx #define CONFIG_VIDEO_MB862xx_ACCEL #define CONFIG_VIDEO_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP
diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 0d1969d..0bd7f02 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -172,7 +172,6 @@ #define CONFIG_VIDEO_MB862xx_ACCEL #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO -#define CONFIG_CONSOLE_EXTRA_INFO #define VIDEO_FB_16BPP_PIXEL_SWAP #define VIDEO_FB_16BPP_WORD_SWAP #define CONFIG_SPLASH_SCREEN diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 84ed7c9..ce5f34e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -671,7 +671,6 @@ CONFIG_COMMON_ENV_SETTINGS CONFIG_COMMON_ENV_UBI CONFIG_COMPACT_FLASH CONFIG_COMPAT -CONFIG_CONSOLE_EXTRA_INFO CONFIG_CONSOLE_INFO_QUIET CONFIG_CONSOLE_SCROLL_LINES CONFIG_CONS_EXTC_PINSEL