Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932782AbbBBHn5 (ORCPT ); Mon, 2 Feb 2015 02:43:57 -0500 Received: from mail2.asahi-net.or.jp ([202.224.39.198]:14905 "EHLO mail2.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbbBBHn4 (ORCPT ); Mon, 2 Feb 2015 02:43:56 -0500 X-Greylist: delayed 1172 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Feb 2015 02:43:55 EST Date: Mon, 02 Feb 2015 16:24:21 +0900 Message-ID: <877fw093oa.wl-ysato@users.sourceforge.jp> From: Yoshinori Sato To: linux-kernel@vger.kernel.org Subject: [PATCH] Add ARCH_MIGHT_HAVE_VGA_CONSOLE 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 Content-Length: 9290 Lines: 300 The dependence of VGA_CONSOLE is complicated. We need clean up. Signed-off-by: Yoshinori Sato --- arch/alpha/Kconfig | 1 + arch/arc/Kconfig | 1 + arch/arm/Kconfig | 1 + arch/c6x/Kconfig | 1 + arch/hexagon/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m32r/Kconfig | 1 + arch/metag/Kconfig | 1 + arch/microblaze/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/nios2/Kconfig | 1 + arch/openrisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/s390/Kconfig | 1 + arch/score/Kconfig | 1 + arch/tile/Kconfig | 1 + arch/um/Kconfig.common | 1 + arch/unicore32/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/video/console/Kconfig | 8 ++++---- 21 files changed, 24 insertions(+), 4 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/arc/Kconfig b/arch/arc/Kconfig index df94ac1..d2c8401 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -36,6 +36,7 @@ config ARC select OF_EARLY_FLATTREE select PERF_USE_VMALLOC select HAVE_DEBUG_STACKOVERFLOW + select ARCH_MIGHT_HAVE_VGA_CONSOLE config TRACE_IRQFLAGS_SUPPORT def_bool y diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 97d07ed..5662728 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -76,6 +76,7 @@ config ARM select PERF_USE_VMALLOC select RTC_LIB select SYS_SUPPORTS_APM_EMULATION + select ARCH_MIGHT_HAVE_VGA_CONSOLE if ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER # Above selects are sorted alphabetically; please add new ones # according to that. Thanks. help diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 77ea09b..d74c07a 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -17,6 +17,7 @@ config C6X select OF_EARLY_FLATTREE select GENERIC_CLOCKEVENTS select MODULES_USE_ELF_RELA + select ARCH_MIGHT_HAVE_VGA_CONSOLE config MMU def_bool n diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 4dc89d1..c08fed2 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -28,6 +28,7 @@ config HEXAGON select MODULES_USE_ELF_RELA select GENERIC_CPU_DEVICES select HAVE_DMA_ATTRS + select ARCH_MIGHT_HAVE_VGA_CONSOLE ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. 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/m32r/Kconfig b/arch/m32r/Kconfig index 9e44bbd..15ed3c9 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -16,6 +16,7 @@ config M32R select ARCH_USES_GETTIMEOFFSET select MODULES_USE_ELF_RELA select HAVE_DEBUG_STACKOVERFLOW + select ARCH_MIGHT_HAVE_VGA_CONSOLE config SBUS bool diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig index 0b389a8..9826622 100644 --- a/arch/metag/Kconfig +++ b/arch/metag/Kconfig @@ -29,6 +29,7 @@ config METAG select OF select OF_EARLY_FLATTREE select SPARSE_IRQ + select ARCH_MIGHT_HAVE_VGA_CONSOLE config STACKTRACE_SUPPORT def_bool y diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 0bce820..94e9f56 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -2,6 +2,7 @@ config MICROBLAZE def_bool y select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_VGA_CONSOLE select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_OPTIONAL_GPIOLIB select BUILDTIME_EXTABLE_SORT diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3289969..0d5fe76 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/nios2/Kconfig b/arch/nios2/Kconfig index 2361acf..579540c 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -15,6 +15,7 @@ config NIOS2 select SOC_BUS select SPARSE_IRQ select USB_ARCH_HAS_HCD if USB_SUPPORT + select ARCH_MIGHT_HAVE_VGA_CONSOLE config GENERIC_CSUM def_bool y diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index e5a693b..25df7f0 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -24,6 +24,7 @@ config OPENRISC select MODULES_USE_ELF_RELA select HAVE_DEBUG_STACKOVERFLOW select OR1K_PIC + select ARCH_MIGHT_HAVE_VGA_CONSOLE config MMU def_bool y 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/s390/Kconfig b/arch/s390/Kconfig index 68b68d7..a95e77a 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -95,6 +95,7 @@ config S390 select ARCH_INLINE_WRITE_UNLOCK_BH select ARCH_INLINE_WRITE_UNLOCK_IRQ select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE + select ARCH_MIGHT_HAVE_VGA_CONSOLE select ARCH_SAVE_PAGE_KEYS if HIBERNATION select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_USE_CMPXCHG_LOCKREF diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 366e1b5..672b6f1 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -14,6 +14,7 @@ config SCORE select VIRT_TO_BUS select MODULES_USE_ELF_REL select CLONE_BACKWARDS + select ARCH_MIGHT_HAVE_VGA_CONSOLE choice prompt "System type" diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 7cca418..4a0453b 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -27,6 +27,7 @@ config TILE select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select HAVE_DEBUG_STACKOVERFLOW select ARCH_WANT_FRAME_POINTERS + select ARCH_MIGHT_HAVE_VGA_CONSOLE # FIXME: investigate whether we need/want these options. # select HAVE_IOREMAP_PROT diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index d195a87..20cbd36 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common @@ -9,6 +9,7 @@ config UML select GENERIC_IO select GENERIC_CLOCKEVENTS select TTY # Needed for line.c + select ARCH_MIGHT_HAVE_VGA_CONSOLE config MMU bool diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 928237a..cc93430 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -18,6 +18,7 @@ config UNICORE32 select ARCH_WANT_FRAME_POINTERS select GENERIC_IOMAP select MODULES_USE_ELF_REL + select ARCH_MIGHT_HAVE_VGA_CONSOLE help UniCore-32 is 32-bit Instruction Set Architecture, including a series of low-power-consumption RISC chip 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/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index e31d494..0719c97 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -21,6 +21,7 @@ config XTENSA select IRQ_DOMAIN select MODULES_USE_ELF_RELA select VIRT_TO_BUS + select ARCH_MIGHT_HAVE_VGA_CONSOLE help Xtensa processors are 32-bit RISC machines designed by Tensilica primarily for embedded systems. These processors are both diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index fe1cd01..bd45569 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -2,14 +2,14 @@ # Video configuration # +config ARCH_MIGHT_HAVE_VGA_CONSOLE + bool + 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 -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/