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 b5f4d93890148fb1d4b27b1077eefdc47eb1bbf8..9d31cf33b244eb31453490fd178630ffc9d59ad4 100644 (file)
--- 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 4eb1856decddc9d65aa97c146de95875ea17454e..3f8c33a04fbf7fda767d5a9aea319346bea78977 100644 (file)
--- 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 2de63eeb04bc9c7a4ca27bc3de23c0d19da85915..f07aa3efdd81827b61ee012b7ecd28fd7b908357 100644 (file)
--- 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 2a42dc02e6380324032aea83f2c0894cef5d431a..5df6fcd438afabae0c772cc2579b38a04331a352 100644 (file)
--- 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 fbfec7dfc0118533dab6918a1cc572694a216afd..564fa1808b7ab942bf234c507ca45bc949c7da90 100644 (file)
--- 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 9b22b0dd039892e9682ebbdc74217086dd5cd85b..ebad38672870ed9e8165fc939c28e04d8c438c93 100644 (file)
--- 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 ea125a3cf04939ebf057653b8c4cf355e7ce7901..ac8c9b7b70b1d67ad4131f12a70431dbb6aee78e 100644 (file)
--- 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 05d55a0bf0dab56ac627d932b4a2e7b81b9d5c91..dfe47ed22f87668c023be81a83dab8a9fe82f223 100644 (file)
--- 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 586eb13aa9edc10daa1b478b41377afa9424aea8..6b02a94e626c30b20e182ed2b3f8b1a6066b0604 100644 (file)
--- 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 5479c418e41d0101805180fbb7cbb05c17168f33..628f7106ca7638bc154ffc238214f011cacbd8ab 100644 (file)
--- 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 d8422d0b6faf520c4aa4bfcde94218fc513c0d1c..215e9fdd81e7d56b949f75ae831593d025adffbc 100644 (file)
--- 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 5ed8d6ac9b774383a309b8a3e10c2638069a8eb3..7be2ef28056a28200e2a76ae3bbf9fa380b8ce21 100644 (file)
--- 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 46e5e8227dac78e6452ab8347e4e23cc89641791..3da85b4ff495e02f4def926622a57f83a2935700 100644 (file)
--- 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 64923664710dbc7b0e54ce67d4b76ac81f46c50a..fa9f9fa48b5773d0ce663a6601e8566849eb14e4 100644 (file)
--- 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 f52bf4793c45f3f6a4b422c2da768058b3fc47ba..7764b23ee99e7a43faba36511a3f6d09f051f81a 100644 (file)
--- 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 a6f7a92c9a17dc8b593dec95c77281c2053b02f7..786fab01976ba4181d2a25c3585baa2353870925 100644 (file)
--- 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 20a05756576e197f71b4d9dbe70a229043e5be5c..1160a97f6daf11165f3f090004658b7ffa1dafb4 100644 (file)
--- 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 3a72a6679d738a63089d97f6894a933a8c508302..c60df498831997fc5950c14a7f47b3c210c40579 100644 (file)
--- 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 7fcfb73450e0d852a989231a97590a3095e3ac94..2de8e2ec6469441dee85d031cc6b97e087f615ad 100644 (file)
--- 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 2e89b1a2ec25dc774496afeedaad462b38e2bac4..2fed3e0fc847d5e5d1c7a512755679208ca81849 100644 (file)
--- 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 0d1969d336f45899c47622503b35d9372b3b7f7e..0bd7f02b3dc0bc670c7cf88607e18edd4eb8be44 100644 (file)
--- 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 44354538cb526e1bb90a5d8a8d6c207e4b4eea67..e3a669603b6304feeb0b4c3c2ff16db76aac3ec1 100644 (file)
--- 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