forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kconfig cleanups for v3.13

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSeP3kAAoJEOiN4VijXeFP0ykP/11/3M1cG9vB5OREJ590eFqR
 rsHT3EP0cnNuJSuVyDSoxsdjUYFv5496BoOe9M1oztb7MuJdY4AFINf8730T4E9Z
 xE6zufStyZej7vBc0RoSYBX+5VUHQFe4wdLq2jC5Fhd0ZVkS+JpyR7JE5ccUvoL4
 iWTwWS/DsI41pZ9WnY3RbomcL8vnY7+zpsy0i//1mSlktmFfP/zBz0Lh9xugg6dG
 Gk+/mjeJ/c6QakdbC5yDXZqXIAv1nSFMqnwmni1eGNCbOG6sAIXJ8gO/TX8Bb1bw
 mBdSdmNCga+U5CPXWEhy5xjLbOrzrogoixLMZ9wZRhbv6Wn5PYd+RZDDZO21/D4a
 ES2WZyvpSxyl/hoPC2QcPSw+JDqBiZzQUQESWbzt81pwGXHUVzXBvpB0gwZhW/6Y
 CQOIl8NAWcQa3cYpT0an/Jr98u3qR/rBrv+iSWn513cEGcX2K0x7LgAWHDPxYnzi
 ROhg0GDq5Sddk/7doIuwRTQuCezYQ6RW3PixcMTcd8gPyUtrCLipDC6riMNFpRrN
 lpRKGv9dJFx8sdRx0nYjb0L4385XRUQIRWLcP9bDo7rDkG9ApJ3uQl67H/16QBjB
 Q/PgHjWae/78ROs8jx3Ek/SNCZUUWchiPWjd2cVZGkSWUQgWskwVeXSHAgINTyJS
 6e/m3rW9c8eyxfje84Fl
 =pPWo
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull Kconfig cleanups from Mark Salter:
 "Remove some unused config options from C6X and clean up PC_PARPORT
  dependencies.  The latter was discussed here:

    https://lkml.org/lkml/2013/10/8/12"

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: remove unused COMMON_CLKDEV Kconfig parameter
  Kconfig cleanup (PARPORT_PC dependencies)
  x86: select ARCH_MIGHT_HAVE_PC_PARPORT
  unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
  sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
  sh: select ARCH_MIGHT_HAVE_PC_PARPORT
  powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
  parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
  mips: select ARCH_MIGHT_HAVE_PC_PARPORT
  microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
  m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
  ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
  arm: select ARCH_MIGHT_HAVE_PC_PARPORT
  alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
  c6x: remove unused parameter in Kconfig
This commit is contained in:
Linus Torvalds 2013-11-15 14:05:15 -08:00
commit f13399f033
14 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/alpha/Kconfig
View file

@ -1,6 +1,7 @@
config ALPHA config ALPHA
bool bool
default y default y
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_AOUT select HAVE_AOUT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE

1
arch/arm/Kconfig
View file

@ -5,6 +5,7 @@ config ARM
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
select ARCH_HAVE_CUSTOM_GPIO_H select ARCH_HAVE_CUSTOM_GPIO_H
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_USE_CMPXCHG_LOCKREF select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select BUILDTIME_EXTABLE_SORT if MMU select BUILDTIME_EXTABLE_SORT if MMU

7
arch/c6x/Kconfig
View file

@ -36,9 +36,6 @@ config GENERIC_HWEIGHT
config GENERIC_BUG config GENERIC_BUG
def_bool y def_bool y
config COMMON_CLKDEV
def_bool y
config C6X_BIG_KERNEL config C6X_BIG_KERNEL
bool "Build a big kernel" bool "Build a big kernel"
help help
@ -105,10 +102,6 @@ menu "Processor type and features"
source "arch/c6x/platforms/Kconfig" source "arch/c6x/platforms/Kconfig"
config TMS320C6X_CACHES_ON
bool "L2 cache support"
default y
config KERNEL_RAM_BASE_ADDRESS config KERNEL_RAM_BASE_ADDRESS
hex "Virtual address of memory base" hex "Virtual address of memory base"
default 0xe0000000 if SOC_TMS320C6455 default 0xe0000000 if SOC_TMS320C6455

1
arch/ia64/Kconfig
View file

@ -6,6 +6,7 @@ menu "Processor type and features"
config IA64 config IA64
bool bool
select ARCH_MIGHT_HAVE_PC_PARPORT
select PCI if (!IA64_HP_SIM) select PCI if (!IA64_HP_SIM)
select ACPI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM)
select PM if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM)

1
arch/m68k/Kconfig
View file

@ -1,6 +1,7 @@
config M68K config M68K
bool bool
default y default y
select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
select HAVE_IDE select HAVE_IDE
select HAVE_AOUT if MMU select HAVE_AOUT if MMU
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE

1
arch/microblaze/Kconfig
View file

@ -1,5 +1,6 @@
config MICROBLAZE config MICROBLAZE
def_bool y def_bool y
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_MEMBLOCK select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_NODE_MAP
select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACER

1
arch/mips/Kconfig
View file

@ -1,6 +1,7 @@
config MIPS config MIPS
bool bool
default y default y
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_CONTEXT_TRACKING select HAVE_CONTEXT_TRACKING
select HAVE_GENERIC_DMA_COHERENT select HAVE_GENERIC_DMA_COHERENT
select HAVE_IDE select HAVE_IDE

1
arch/parisc/Kconfig
View file

@ -1,6 +1,7 @@
config PARISC config PARISC
def_bool y def_bool y
select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_FUNCTION_TRACER if 64BIT select HAVE_FUNCTION_TRACER if 64BIT

1
arch/powerpc/Kconfig
View file

@ -85,6 +85,7 @@ config GENERIC_HWEIGHT
config PPC config PPC
bool bool
default y default y
select ARCH_MIGHT_HAVE_PC_PARPORT
select BINFMT_ELF select BINFMT_ELF
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE

1
arch/sh/Kconfig
View file

@ -1,5 +1,6 @@
config SUPERH config SUPERH
def_bool y def_bool y
select ARCH_MIGHT_HAVE_PC_PARPORT
select EXPERT select EXPERT
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select HAVE_IDE if HAS_IOPORT select HAVE_IDE if HAS_IOPORT

1
arch/sparc/Kconfig
View file

@ -12,6 +12,7 @@ config 64BIT
config SPARC config SPARC
bool bool
default y default y
select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI
select OF select OF
select OF_PROMTREE select OF_PROMTREE
select HAVE_IDE select HAVE_IDE

1
arch/unicore32/Kconfig
View file

@ -1,5 +1,6 @@
config UNICORE32 config UNICORE32
def_bool y def_bool y
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_MEMBLOCK select HAVE_MEMBLOCK
select HAVE_GENERIC_DMA_COHERENT select HAVE_GENERIC_DMA_COHERENT
select HAVE_DMA_ATTRS select HAVE_DMA_ATTRS

1
arch/x86/Kconfig
View file

@ -22,6 +22,7 @@ config X86_64
config X86 config X86
def_bool y def_bool y
select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
select ARCH_MIGHT_HAVE_PC_PARPORT
select HAVE_AOUT if X86_32 select HAVE_AOUT if X86_32
select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_SUPPORTS_NUMA_BALANCING

13
drivers/parport/Kconfig
View file

@ -31,15 +31,18 @@ menuconfig PARPORT
If unsure, say Y. 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 if PARPORT
config PARPORT_PC config PARPORT_PC
tristate "PC-style hardware" tristate "PC-style hardware"
depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ depends on ARCH_MIGHT_HAVE_PC_PARPORT
(!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ help
!XTENSA && !CRIS
---help---
You should say Y here if you have a PC-style parallel port. All You should say Y here if you have a PC-style parallel port. All
IBM PC compatible computers and some Alphas have PC-style IBM PC compatible computers and some Alphas have PC-style
parallel ports. PA-RISC owners should only say Y here if they parallel ports. PA-RISC owners should only say Y here if they