From 1a81b94d4fc8470848eb80e39a6001c48cc3fc29 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Tue, 17 Sep 2013 05:21:29 +0200 Subject: [PATCH 01/15] c6x: remove unused parameter in Kconfig This patch proposes to remove the TMS320C6X_CACHES_ON kernel configuration parameter defined in arch/c6x/Kconfig, but used nowhere in the makefiles and source code. Signed-off-by: Michael Opdenacker Acked by: Mark Salter --- arch/c6x/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index 957dd00ea561..b4f77258cacc 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -105,10 +105,6 @@ menu "Processor type and features" source "arch/c6x/platforms/Kconfig" -config TMS320C6X_CACHES_ON - bool "L2 cache support" - default y - config KERNEL_RAM_BASE_ADDRESS hex "Virtual address of memory base" default 0xe0000000 if SOC_TMS320C6455 From 1571ed0c45ccb0865cb454b2215d18cd27f72baf Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 19:51:52 -0400 Subject: [PATCH 02/15] alpha: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter Acked-by: Richard Henderson CC: linux-alpha@vger.kernel.org --- arch/alpha/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 35a300d4a9fb..84803f88a169 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -1,6 +1,7 @@ config ALPHA bool default y + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_AOUT select HAVE_IDE select HAVE_OPROFILE From d7018848940211eb5876282f8efe08fe456e89b2 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:07:58 -0400 Subject: [PATCH 03/15] arm: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Russell King CC: linux-arm-kernel@lists.infradead.org --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3f7714d8d2d2..7db8abe071f4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -5,6 +5,7 @@ config ARM select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAVE_CUSTOM_GPIO_H + select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT if MMU select CLONE_BACKWARDS From 468bcf08fbbc6296b96f478b1422d0622c0fdc0d Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:08:56 -0400 Subject: [PATCH 04/15] ia64: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Tony Luck CC: Fenghua Yu CC: linux-ia64@vger.kernel.org --- arch/ia64/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 7740ab10a171..b10d61bc0f2a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -6,6 +6,7 @@ menu "Processor type and features" config IA64 bool + select ARCH_MIGHT_HAVE_PC_PARPORT select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM) From 1a7f6be5c95f8475b0cb232eafa9367a5d2cbf43 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:10:21 -0400 Subject: [PATCH 05/15] m68k: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter Acked by: Geert Uytterhoeven CC: linux-m68k@lists.linux-m68k.org --- arch/m68k/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 311a300d48cc..75f25a8e3001 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -1,6 +1,7 @@ config M68K bool default y + select ARCH_MIGHT_HAVE_PC_PARPORT if ISA select HAVE_IDE select HAVE_AOUT if MMU select HAVE_DEBUG_BUGVERBOSE From 355f65a391282f2aa9dfb0ce6414f99177435264 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:12:28 -0400 Subject: [PATCH 06/15] microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Michal Simek CC: microblaze-uclinux@itee.uq.edu.au --- arch/microblaze/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index b82f82b74319..8370114e78aa 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -1,5 +1,6 @@ config MICROBLAZE def_bool y + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_FUNCTION_TRACER From a862a4262f9900239389515f79c6c9dfc8de6080 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:13:33 -0400 Subject: [PATCH 07/15] mips: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter Acked-by: Ralf Baechle CC: linux-mips@linux-mips.org --- arch/mips/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f75ab4a2f246..7861401f3b66 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1,6 +1,7 @@ config MIPS bool default y + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_CONTEXT_TRACKING select HAVE_GENERIC_DMA_COHERENT select HAVE_IDE From 4a24fb2f30c362ee63663a232266fd503bb9cdc2 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:14:01 -0400 Subject: [PATCH 08/15] parisc: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: "James E.J. Bottomley" CC: Helge Deller CC: linux-parisc@vger.kernel.org --- arch/parisc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index ad2ce8dab996..deb713c647f4 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -1,6 +1,7 @@ config PARISC def_bool y select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_IDE select HAVE_OPROFILE select HAVE_FUNCTION_TRACER if 64BIT From b7e7c37b6e84bd1aec8085606fa3fb42b5cf5a66 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:15:32 -0400 Subject: [PATCH 09/15] powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 38f3b7e47ec5..fcc626cc577b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -85,6 +85,7 @@ config GENERIC_HWEIGHT config PPC bool default y + select ARCH_MIGHT_HAVE_PC_PARPORT select BINFMT_ELF select OF select OF_EARLY_FLATTREE From 09d8dd9371aa38e7277f12059ca07503c39a291a Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:15:58 -0400 Subject: [PATCH 10/15] sh: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Paul Mundt CC: linux-sh@vger.kernel.org --- arch/sh/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 224f4bc9925e..f56d7f8b6f64 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -1,5 +1,6 @@ config SUPERH def_bool y + select ARCH_MIGHT_HAVE_PC_PARPORT select EXPERT select CLKDEV_LOOKUP select HAVE_IDE if HAS_IOPORT From ff649a6f9b526410e59d7694912499f17ae190c3 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:16:32 -0400 Subject: [PATCH 11/15] sparc: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: "David S. Miller" CC: sparclinux@vger.kernel.org --- arch/sparc/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2137ad667438..242200fbbbcf 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -12,6 +12,7 @@ config 64BIT config SPARC bool default y + select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI select OF select OF_PROMTREE select HAVE_IDE From e00ca5152b0cb9e1228a30b45c5037765b92a6f1 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:17:30 -0400 Subject: [PATCH 12/15] unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter CC: Guan Xuetao --- arch/unicore32/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 82cdd8906f3d..a7ba27b2752b 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig @@ -1,5 +1,6 @@ config UNICORE32 def_bool y + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_MEMBLOCK select HAVE_GENERIC_DMA_COHERENT select HAVE_DMA_ATTRS From 77fbbc81127d2a26e4e53e018987d6af13829298 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:18:07 -0400 Subject: [PATCH 13/15] x86: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter Acked-by: Ingo Molnar CC: Thomas Gleixner CC: "H. Peter Anvin" CC: x86@kernel.org --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e241a1930c98..5ed65706765d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86_64 config X86 def_bool y select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS + select ARCH_MIGHT_HAVE_PC_PARPORT select HAVE_AOUT if X86_32 select HAVE_UNSTABLE_SCHED_CLOCK select ARCH_SUPPORTS_NUMA_BALANCING From d90c3eb31535e0a1b7b5528ad2011e26f4b9a79a Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 7 Oct 2013 22:21:18 -0400 Subject: [PATCH 14/15] Kconfig cleanup (PARPORT_PC dependencies) Remove messy dependencies from PARPORT_PC by having it depend on one Kconfig symbol (ARCH_MIGHT_HAVE_PC_PARPORT) and having architectures which need it, select ARCH_MIGHT_HAVE_PC_PARPORT in arch/*/Kconfig. New architectures are unlikely to need PARPORT_PC, so this avoids having an ever growing list of architectures to exclude. Those architectures which do select ARCH_MIGHT_HAVE_PC_PARPORT in this patch are the ones which have an asm/parport.h (or use the generic version). Signed-off-by: Mark Salter Acked-by: Ingo Molnar CC: Richard Henderson CC: linux-alpha@vger.kernel.org CC: Vineet Gupta CC: Russell King CC: linux-arm-kernel@lists.infradead.org CC: Tony Luck CC: Fenghua Yu CC: linux-ia64@vger.kernel.org CC: Geert Uytterhoeven CC: linux-m68k@lists.linux-m68k.org CC: Michal Simek CC: microblaze-uclinux@itee.uq.edu.au CC: Ralf Baechle CC: linux-mips@linux-mips.org CC: "James E.J. Bottomley" CC: Helge Deller CC: linux-parisc@vger.kernel.org CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: linuxppc-dev@lists.ozlabs.org CC: Paul Mundt CC: linux-sh@vger.kernel.org CC: "David S. Miller" CC: sparclinux@vger.kernel.org CC: Guan Xuetao CC: Thomas Gleixner CC: "H. Peter Anvin" CC: x86@kernel.org --- drivers/parport/Kconfig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 70694ce38be2..f5366850af7a 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -31,13 +31,17 @@ menuconfig PARPORT If unsure, say Y. +config ARCH_MIGHT_HAVE_PC_PARPORT + bool + help + Select this config option from the architecture Kconfig if + the architecture might have PC parallel port hardware. + if PARPORT config PARPORT_PC tristate "PC-style hardware" - depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ - (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ - !XTENSA && !CRIS && !H8300 + depends on ARCH_MIGHT_HAVE_PC_PARPORT ---help--- You should say Y here if you have a PC-style parallel port. All From b2c32b32a21291107c3797448e0bd36716c8e445 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Sun, 27 Oct 2013 13:43:04 +0100 Subject: [PATCH 15/15] c6x: remove unused COMMON_CLKDEV Kconfig parameter This removes the COMMON_CLKDEV kernel configuration parameter defined in arch/c6x/Kconfig, but used nowhere in the makefiles and source code. Signed-off-by: Michael Opdenacker Signed-off-by: Mark Salter --- arch/c6x/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig index b4f77258cacc..77ea09b8bce1 100644 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@ -36,9 +36,6 @@ config GENERIC_HWEIGHT config GENERIC_BUG def_bool y -config COMMON_CLKDEV - def_bool y - config C6X_BIG_KERNEL bool "Build a big kernel" help