From: Simon Glass <sjg@chromium.org> Date: Tue, 18 Oct 2016 02:12:53 +0000 (-0600) Subject: Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig X-Git-Tag: v2025.01-rc5-pxa1908~8291 X-Git-Url: http://git.dujemihanovic.xyz/html/static/gitweb.css?a=commitdiff_plain;h=fbda683292da37690d9729561a18ccfa51491235;p=u-boot.git Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig 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> --- diff --git a/configs/MIP405T_defconfig b/configs/MIP405T_defconfig index b5f4d93890..9d31cf33b2 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -16,4 +16,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 4eb1856dec..3f8c33a04f 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -19,4 +19,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 2de63eeb04..f07aa3efdd 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -21,4 +21,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 2a42dc02e6..5df6fcd438 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -19,4 +19,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 fbfec7dfc0..564fa1808b 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -21,4 +21,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 9b22b0dd03..ebad386728 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -21,4 +21,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 ea125a3cf0..ac8c9b7b70 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -21,4 +21,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 05d55a0bf0..dfe47ed22f 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_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/charon_defconfig b/configs/charon_defconfig index 586eb13aa9..6b02a94e62 100644 --- a/configs/charon_defconfig +++ b/configs/charon_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/icon_defconfig b/configs/icon_defconfig index 5479c418e4..628f7106ca 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -20,4 +20,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 d8422d0b6f..215e9fdd81 100644 --- a/configs/ipek01_defconfig +++ b/configs/ipek01_defconfig @@ -15,4 +15,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 5ed8d6ac9b..7be2ef2805 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -22,4 +22,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 46e5e8227d..3da85b4ff4 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -21,4 +21,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 6492366471..fa9f9fa48b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -513,6 +513,16 @@ config VIDEO_SW_CURSOR position when entering text on the console. It is recommended to enable this. +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 f52bf4793c..7764b23ee9 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -340,7 +340,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 a6f7a92c9a..786fab0197 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -300,7 +300,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 20a0575657..1160a97f6d 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 3a72a6679d..c60df49883 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 7fcfb73450..2de8e2ec64 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 2e89b1a2ec..2fed3e0fc8 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 0d1969d336..0bd7f02b3d 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 44354538cb..e3a669603b 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