From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbbBOHWp (ORCPT ); Sun, 15 Feb 2015 02:22:45 -0500 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:63940 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbbBOHWn (ORCPT ); Sun, 15 Feb 2015 02:22:43 -0500 Date: Sun, 15 Feb 2015 16:22:40 +0900 Message-ID: <873867r64f.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH v4] Add ARCH_MIGHT_HAVE_VGA_CONSOLE In-Reply-To: <877fw093oa.wl-ysato@users.sourceforge.jp> References: <877fw093oa.wl-ysato@users.sourceforge.jp> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changes V4 - Fix error in VT=n Changes v3 - Remove um - ARM sort alphabetical order Changes v2 - Remove some archtecture Signed-off-by: Yoshinori Sato Reviewed-by: Arnd Bergmann --- arch/alpha/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/video/Kconfig | 4 +--- drivers/video/console/Kconfig | 11 ++++++----- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index b7ff9a3..5940d83 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -27,6 +27,7 @@ config ALPHA select MODULES_USE_ELF_RELA select ODD_RT_SIGACTION select OLD_SIGSUSPEND + select ARCH_MIGHT_HAVE_VGA_CONSOLE help The Alpha is a 64-bit general-purpose processor designed and marketed by the Digital Equipment Corporation of blessed memory, diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 97d07ed..cd936c6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -7,6 +7,7 @@ config ARM select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_VGA_CONSOLE if ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 074e52b..55e91d9 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,6 +47,7 @@ config IA64 select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF select HAVE_ARCH_AUDITSYSCALL + select ARCH_MIGHT_HAVE_VGA_CONSOLE default y help The Itanium Processor Family is Intel's 64-bit successor to diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3289969..d921c4c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -54,6 +54,7 @@ config MIPS select CPU_PM if CPU_IDLE select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_BINFMT_ELF_STATE + select ARCH_MIGHT_HAVE_VGA_CONSOLE menu "Machine selection" diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a2a168e..4c2e2d2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -152,6 +152,7 @@ config PPC select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN select NO_BOOTMEM select HAVE_GENERIC_RCU_GUP + select ARCH_MIGHT_HAVE_VGA_CONSOLE if !4xx && !8xx config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ba397bd..981c1a2 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -138,6 +138,7 @@ config X86 select HAVE_ACPI_APEI_NMI if ACPI select ACPI_LEGACY_TABLES_LOOKUP if ACPI select X86_FEATURE_NAMES if PROC_FS + select ARCH_MIGHT_HAVE_VGA_CONSOLE config INSTRUCTION_DECODER def_bool y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8bf495f..5a8b576 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -42,9 +42,7 @@ config VIDEOMODE_HELPERS config HDMI bool -if VT - source "drivers/video/console/Kconfig" -endif +source "drivers/video/console/Kconfig" if FB || SGI_NEWPORT_CONSOLE source "drivers/video/logo/Kconfig" diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index fe1cd01..98f0af1 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -2,14 +2,15 @@ # Video configuration # +config ARCH_MIGHT_HAVE_VGA_CONSOLE + bool + +if VT menu "Console display driver support" config VGA_CONSOLE bool "VGA text console" if EXPERT || !X86 - depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \ - !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ - (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ - !ARM64 + depends on ARCH_MIGHT_HAVE_VGA_CONSOLE default y help Saying Y here will allow you to use Linux in text mode through a @@ -137,4 +138,4 @@ config STI_CONSOLE The alternative is to use your primary serial port as a console. endmenu - +endif -- 2.1.4