From patchwork Mon Sep 19 22:33:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 671998 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sdLPh2Zj6z9s5w for ; Tue, 20 Sep 2016 08:38:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=OZYk6bNy; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 63B484B99D; Tue, 20 Sep 2016 00:35:42 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kiKa6PzomeRJ; Tue, 20 Sep 2016 00:35:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4E27AA75AC; Tue, 20 Sep 2016 00:34:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1C72B3822 for ; Tue, 20 Sep 2016 00:34:14 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NSeTqXyUSOAT for ; Tue, 20 Sep 2016 00:34:14 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-io0-f174.google.com (mail-io0-f174.google.com [209.85.223.174]) by theia.denx.de (Postfix) with ESMTPS id 0BE65B382F for ; Tue, 20 Sep 2016 00:33:58 +0200 (CEST) Received: by mail-io0-f174.google.com with SMTP id m186so2462987ioa.2 for ; Mon, 19 Sep 2016 15:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=99F9hmzqL21VfFmvgjuKqdbDIzx11LocVnbtf6cr0JA=; b=OZYk6bNyrPr+YRDOpPvuKut7tnQOJm3WPRst9TY+1qzzS4mBfdwLaIv8YizTewMg6B WV3rD4KjSQfMFL/pG16OoFncQadYbLklJzFZ+T2kaOIQmhibdKYy9AiWwfF+ZNz3f6NY VJguMbVqv7OjtEiSAABCmKbvmO1qeL+8GC4fJYxO4Rh1O2C0s+TvvnUGgj+/4YasOfGU oMuKRsOV07mRrVEujFR0tk2TzAHp+Xz8lTHi8NSuVc//jyev2Lntm3Uno487nVWXDJ4n eMQf9/7LqdZCDolEg3Sljo9ikeVps8409bdMSQZVbr235RJB60a1xeLFExFLkmX0o6te jD1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=99F9hmzqL21VfFmvgjuKqdbDIzx11LocVnbtf6cr0JA=; b=VMFKMjY9T9fS1R+oBxi+ijJREODObnAbx4h3V3pSG2LQu388NDLtiXaq+4AWySf9nT aBHntGmOniy8poqs85mEy0AdalczpSaya6twGqoPa6tt5epNz/6Lv14illGYRXo/MCrf rkGh+FHyKLMYsR3kWPkOr27hFlmulblpCixp9Q+owyzntLm8/U19y5/Rc8ZhwNQKh2ba 4j+NfX8vMCCG0r549Pu4vS70qqSIaI6Z5g3ljajofWATrNBDqdI7o1r2FSRJf8YWu0ZR I6d97S7hKEzJ1ZlumKR/1isiPnyD0ZNp4bjebLNeE6W7C59ay5UOkTetr4UNCf/D9taB zlFQ== X-Gm-Message-State: AE9vXwOE4YfhO0iE9s983LU7WWS7Klje56RM5+QVDuuQlr19xuE+51CScoy59U9hMz/Vxd4U X-Received: by 10.107.137.104 with SMTP id l101mr37481933iod.98.1474324426476; Mon, 19 Sep 2016 15:33:46 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:1005:12:cd78:a834:4ada:177d]) by smtp.gmail.com with ESMTPSA id f201sm9698389ioe.28.2016.09.19.15.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2016 15:33:43 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 34EAB220BA6; Mon, 19 Sep 2016 16:33:42 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 19 Sep 2016 16:33:04 -0600 Message-Id: <1474324392-26596-21-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1474324392-26596-1-git-send-email-sjg@chromium.org> References: <1474324392-26596-1-git-send-email-sjg@chromium.org> Cc: Tom Rini Subject: [U-Boot] [PATCH 20/28] Convert CONFIG_CONSOLE_EXTRA_INFO to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_CONSOLE_EXTRA_INFO Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- 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 387d60d..6e3a721 100644 --- a/configs/MIP405T_defconfig +++ b/configs/MIP405T_defconfig @@ -16,4 +16,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_VIDEO_CT69000=y diff --git a/configs/MIP405_defconfig b/configs/MIP405_defconfig index 1acec56..8e26ce6 100644 --- a/configs/MIP405_defconfig +++ b/configs/MIP405_defconfig @@ -18,4 +18,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_VIDEO_CT69000=y diff --git a/configs/MiniFAP_defconfig b/configs/MiniFAP_defconfig index 6df03b1..208f894 100644 --- a/configs/MiniFAP_defconfig +++ b/configs/MiniFAP_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/PIP405_defconfig b/configs/PIP405_defconfig index b86d28b..891cd43 100644 --- a/configs/PIP405_defconfig +++ b/configs/PIP405_defconfig @@ -18,4 +18,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=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 49a53bf..ec75792 100644 --- a/configs/TQM5200_B_HIGHBOOT_defconfig +++ b/configs/TQM5200_B_HIGHBOOT_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_B_defconfig b/configs/TQM5200_B_defconfig index 8acc5d2..2d7ca16 100644 --- a/configs/TQM5200_B_defconfig +++ b/configs/TQM5200_B_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_STK100_defconfig b/configs/TQM5200_STK100_defconfig index 0e11a00..c258821 100644 --- a/configs/TQM5200_STK100_defconfig +++ b/configs/TQM5200_STK100_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/TQM5200_defconfig b/configs/TQM5200_defconfig index 6ef0df7..3e189bd 100644 --- a/configs/TQM5200_defconfig +++ b/configs/TQM5200_defconfig @@ -21,4 +21,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/charon_defconfig b/configs/charon_defconfig index 3de627b..188dc88 100644 --- a/configs/charon_defconfig +++ b/configs/charon_defconfig @@ -21,4 +21,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/icon_defconfig b/configs/icon_defconfig index 15ed170..232f67d 100644 --- a/configs/icon_defconfig +++ b/configs/icon_defconfig @@ -20,4 +20,5 @@ CONFIG_CMD_FAT=y CONFIG_SYS_NS16550=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/ipek01_defconfig b/configs/ipek01_defconfig index bb6801f..4e90df1 100644 --- a/configs/ipek01_defconfig +++ b/configs/ipek01_defconfig @@ -16,4 +16,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/lwmon5_defconfig b/configs/lwmon5_defconfig index e31f4eb..0ef4c63 100644 --- a/configs/lwmon5_defconfig +++ b/configs/lwmon5_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index 1141990..bcbbf06 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -22,4 +22,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_CFB_CONSOLE=y CONFIG_VGA_AS_SINGLE_DEVICE=y +CONFIG_CONSOLE_EXTRA_INFO=y CONFIG_OF_LIBFDT=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 278600c..81446cc 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -480,6 +480,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 7c7acb1..0035c01 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -347,7 +347,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 dd83004..e9ecdad 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 06d2be5..5439ed6 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -103,7 +103,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 5298376..d53080b 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -50,7 +50,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 8892eca..3ea8a37 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -361,7 +361,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 16e4b02..0ae2b78 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -173,7 +173,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 9cb12f7..204830b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -673,7 +673,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