Commit 719736e1 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Michael Ellerman
Browse files

powerpc: remove redundant 'default n' from Kconfig-s 



'default n' is the default value for any bool or tristate Kconfig
setting so there is no need to write it explicitly.

Also since commit f467c564 ("kconfig: only write '# CONFIG_FOO
is not set' for visible symbols") the Kconfig behavior is the same
regardless of 'default n' being present or not:

    ...
    One side effect of (and the main motivation for) this change is making
    the following two definitions behave exactly the same:

        config FOO
                bool

        config FOO
                bool
                default n

    With this change, neither of these will generate a
    '# CONFIG_FOO is not set' line (assuming FOO isn't selected/implied).
    That might make it clearer to people that a bare 'default n' is
    redundant.
    ...

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b27e5f93

arch/powerpc/Kconfig

+0 −14
Original line number Original line Diff line number Diff line
@@ -286,12 +286,10 @@ config ARCH_MAY_HAVE_PC_FDC 




config PPC_UDBG_16550

config PPC_UDBG_16550

	bool

	bool

	default n





config GENERIC_TBSYNC

config GENERIC_TBSYNC

	bool

	bool

	default y if PPC32 && SMP

	default y if PPC32 && SMP

	default n





config AUDIT_ARCH

config AUDIT_ARCH

	bool

	bool
@@ -310,13 +308,11 @@ config EPAPR_BOOT 
	bool

	bool

	help

	help

	  Used to allow a board to specify it wants an ePAPR compliant wrapper.

	  Used to allow a board to specify it wants an ePAPR compliant wrapper.

	default n





config DEFAULT_UIMAGE

config DEFAULT_UIMAGE

	bool

	bool

	help

	help

	  Used to allow a board to specify it wants a uImage built by default

	  Used to allow a board to specify it wants a uImage built by default

	default n





config ARCH_HIBERNATION_POSSIBLE

config ARCH_HIBERNATION_POSSIBLE

	bool

	bool
@@ -330,11 +326,9 @@ config ARCH_SUSPEND_POSSIBLE 




config PPC_DCR_NATIVE

config PPC_DCR_NATIVE

	bool

	bool

	default n





config PPC_DCR_MMIO

config PPC_DCR_MMIO

	bool

	bool

	default n





config PPC_DCR

config PPC_DCR

	bool

	bool
@@ -345,7 +339,6 @@ config PPC_OF_PLATFORM_PCI 
	bool

	bool

	depends on PCI

	depends on PCI

	depends on PPC64 # not supported on 32 bits yet

	depends on PPC64 # not supported on 32 bits yet

	default n





config ARCH_SUPPORTS_DEBUG_PAGEALLOC

config ARCH_SUPPORTS_DEBUG_PAGEALLOC

	depends on PPC32 || PPC_BOOK3S_64

	depends on PPC32 || PPC_BOOK3S_64
@@ -448,14 +441,12 @@ config PPC_TRANSACTIONAL_MEM 
       depends on SMP

       depends on SMP

       select ALTIVEC

       select ALTIVEC

       select VSX

       select VSX

       default n

       ---help---

       ---help---

         Support user-mode Transactional Memory on POWERPC.

         Support user-mode Transactional Memory on POWERPC.





config LD_HEAD_STUB_CATCH

config LD_HEAD_STUB_CATCH

	bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT

	bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT

	depends on PPC64

	depends on PPC64

	default n

	help

	help

	  Very large kernels can cause linker branch stubs to be generated by

	  Very large kernels can cause linker branch stubs to be generated by

	  code in head_64.S, which moves the head text sections out of their

	  code in head_64.S, which moves the head text sections out of their
@@ -558,7 +549,6 @@ config RELOCATABLE 
config RELOCATABLE_TEST

config RELOCATABLE_TEST

	bool "Test relocatable kernel"

	bool "Test relocatable kernel"

	depends on (PPC64 && RELOCATABLE)

	depends on (PPC64 && RELOCATABLE)

	default n

	help

	help

	  This runs the relocatable kernel at the address it was initially

	  This runs the relocatable kernel at the address it was initially

	  loaded at, which tends to be non-zero and therefore test the

	  loaded at, which tends to be non-zero and therefore test the
@@ -770,7 +760,6 @@ config PPC_SUBPAGE_PROT 




config PPC_COPRO_BASE

config PPC_COPRO_BASE

	bool

	bool

	default n





config SCHED_SMT

config SCHED_SMT

	bool "SMT (Hyperthreading) scheduler support"

	bool "SMT (Hyperthreading) scheduler support"
@@ -893,7 +882,6 @@ config PPC_INDIRECT_PCI 
	bool

	bool

	depends on PCI

	depends on PCI

	default y if 40x || 44x

	default y if 40x || 44x

	default n





config EISA

config EISA

	bool

	bool
@@ -990,7 +978,6 @@ source "drivers/pcmcia/Kconfig" 




config HAS_RAPIDIO

config HAS_RAPIDIO

	bool

	bool

	default n





config RAPIDIO

config RAPIDIO

	tristate "RapidIO support"

	tristate "RapidIO support"
@@ -1013,7 +1000,6 @@ endmenu 




config NONSTATIC_KERNEL

config NONSTATIC_KERNEL

	bool

	bool

	default n





menu "Advanced setup"

menu "Advanced setup"

	depends on PPC32

	depends on PPC32

arch/powerpc/Kconfig.debug

+0 −6
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 




config PPC_DISABLE_WERROR

config PPC_DISABLE_WERROR

	bool "Don't build arch/powerpc code with -Werror"

	bool "Don't build arch/powerpc code with -Werror"

	default n

	help

	help

	  This option tells the compiler NOT to build the code under

	  This option tells the compiler NOT to build the code under

	  arch/powerpc with the -Werror flag (which means warnings

	  arch/powerpc with the -Werror flag (which means warnings
@@ -56,7 +55,6 @@ config PPC_EMULATED_STATS 
config CODE_PATCHING_SELFTEST

config CODE_PATCHING_SELFTEST

	bool "Run self-tests of the code-patching code"

	bool "Run self-tests of the code-patching code"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL

	default n





config JUMP_LABEL_FEATURE_CHECKS

config JUMP_LABEL_FEATURE_CHECKS

	bool "Enable use of jump label for cpu/mmu_has_feature()"

	bool "Enable use of jump label for cpu/mmu_has_feature()"
@@ -70,7 +68,6 @@ config JUMP_LABEL_FEATURE_CHECKS 
config JUMP_LABEL_FEATURE_CHECK_DEBUG

config JUMP_LABEL_FEATURE_CHECK_DEBUG

	bool "Do extra check on feature fixup calls"

	bool "Do extra check on feature fixup calls"

	depends on DEBUG_KERNEL && JUMP_LABEL_FEATURE_CHECKS

	depends on DEBUG_KERNEL && JUMP_LABEL_FEATURE_CHECKS

	default n

	help

	help

	  This tries to catch incorrect usage of cpu_has_feature() and

	  This tries to catch incorrect usage of cpu_has_feature() and

	  mmu_has_feature() in the code.

	  mmu_has_feature() in the code.
@@ -80,16 +77,13 @@ config JUMP_LABEL_FEATURE_CHECK_DEBUG 
config FTR_FIXUP_SELFTEST

config FTR_FIXUP_SELFTEST

	bool "Run self-tests of the feature-fixup code"

	bool "Run self-tests of the feature-fixup code"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL

	default n





config MSI_BITMAP_SELFTEST

config MSI_BITMAP_SELFTEST

	bool "Run self-tests of the MSI bitmap code"

	bool "Run self-tests of the MSI bitmap code"

	depends on DEBUG_KERNEL

	depends on DEBUG_KERNEL

	default n





config PPC_IRQ_SOFT_MASK_DEBUG

config PPC_IRQ_SOFT_MASK_DEBUG

	bool "Include extra checks for powerpc irq soft masking"

	bool "Include extra checks for powerpc irq soft masking"

	default n





config XMON

config XMON

	bool "Include xmon kernel debugger"

	bool "Include xmon kernel debugger"

arch/powerpc/platforms/40x/Kconfig

+0 −9
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
config ACADIA

config ACADIA

	bool "Acadia"

	bool "Acadia"

	depends on 40x

	depends on 40x

	default n

	select PPC40x_SIMPLE

	select PPC40x_SIMPLE

	select 405EZ

	select 405EZ

	help

	help
@@ -11,7 +10,6 @@ config ACADIA 
config EP405

config EP405

	bool "EP405/EP405PC"

	bool "EP405/EP405PC"

	depends on 40x

	depends on 40x

	default n

	select 405GP

	select 405GP

	select PCI

	select PCI

	help

	help
@@ -20,7 +18,6 @@ config EP405 
config HOTFOOT

config HOTFOOT

        bool "Hotfoot"

        bool "Hotfoot"

	depends on 40x

	depends on 40x

	default n

	select PPC40x_SIMPLE

	select PPC40x_SIMPLE

	select PCI

	select PCI

        help

        help
@@ -29,7 +26,6 @@ config HOTFOOT 
config KILAUEA

config KILAUEA

	bool "Kilauea"

	bool "Kilauea"

	depends on 40x

	depends on 40x

	default n

	select 405EX

	select 405EX

	select PPC40x_SIMPLE

	select PPC40x_SIMPLE

	select PPC4xx_PCI_EXPRESS

	select PPC4xx_PCI_EXPRESS
@@ -41,7 +37,6 @@ config KILAUEA 
config MAKALU

config MAKALU

	bool "Makalu"

	bool "Makalu"

	depends on 40x

	depends on 40x

	default n

	select 405EX

	select 405EX

	select PCI

	select PCI

	select PPC4xx_PCI_EXPRESS

	select PPC4xx_PCI_EXPRESS
@@ -62,7 +57,6 @@ config WALNUT 
config XILINX_VIRTEX_GENERIC_BOARD

config XILINX_VIRTEX_GENERIC_BOARD

	bool "Generic Xilinx Virtex board"

	bool "Generic Xilinx Virtex board"

	depends on 40x

	depends on 40x

	default n

	select XILINX_VIRTEX_II_PRO

	select XILINX_VIRTEX_II_PRO

	select XILINX_VIRTEX_4_FX

	select XILINX_VIRTEX_4_FX

	select XILINX_INTC

	select XILINX_INTC
@@ -80,7 +74,6 @@ config XILINX_VIRTEX_GENERIC_BOARD 
config OBS600

config OBS600

	bool "OpenBlockS 600"

	bool "OpenBlockS 600"

	depends on 40x

	depends on 40x

	default n

	select 405EX

	select 405EX

	select PPC40x_SIMPLE

	select PPC40x_SIMPLE

	help

	help
@@ -90,7 +83,6 @@ config OBS600 
config PPC40x_SIMPLE

config PPC40x_SIMPLE

	bool "Simple PowerPC 40x board support"

	bool "Simple PowerPC 40x board support"

	depends on 40x

	depends on 40x

	default n

	help

	help

	  This option enables the simple PowerPC 40x platform support.

	  This option enables the simple PowerPC 40x platform support.
@@ -156,7 +148,6 @@ config IBM405_ERR51 
config APM8018X

config APM8018X

	bool "APM8018X"

	bool "APM8018X"

	depends on 40x

	depends on 40x

	default n

	select PPC40x_SIMPLE

	select PPC40x_SIMPLE

	help

	help

	  This option enables support for the AppliedMicro APM8018X evaluation

	  This option enables support for the AppliedMicro APM8018X evaluation

arch/powerpc/platforms/44x/Kconfig

+0 −22
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
config PPC_47x

config PPC_47x

	bool "Support for 47x variant"

	bool "Support for 47x variant"

	depends on 44x

	depends on 44x

	default n

	select MPIC

	select MPIC

	help

	help

	  This option enables support for the 47x family of processors and is

	  This option enables support for the 47x family of processors and is
@@ -11,7 +10,6 @@ config PPC_47x 
config BAMBOO

config BAMBOO

	bool "Bamboo"

	bool "Bamboo"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440EP

	select 440EP

	select PCI

	select PCI
@@ -21,7 +19,6 @@ config BAMBOO 
config BLUESTONE

config BLUESTONE

	bool "Bluestone"

	bool "Bluestone"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select APM821xx

	select APM821xx

	select PCI_MSI

	select PCI_MSI
@@ -44,7 +41,6 @@ config EBONY 
config SAM440EP

config SAM440EP

        bool "Sam440ep"

        bool "Sam440ep"

	depends on 44x

	depends on 44x

        default n

        select 440EP

        select 440EP

        select PCI

        select PCI

        help

        help
@@ -53,7 +49,6 @@ config SAM440EP 
config SEQUOIA

config SEQUOIA

	bool "Sequoia"

	bool "Sequoia"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440EPX

	select 440EPX

	help

	help
@@ -62,7 +57,6 @@ config SEQUOIA 
config TAISHAN

config TAISHAN

	bool "Taishan"

	bool "Taishan"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440GX

	select 440GX

	select PCI

	select PCI
@@ -73,7 +67,6 @@ config TAISHAN 
config KATMAI

config KATMAI

	bool "Katmai"

	bool "Katmai"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440SPe

	select 440SPe

	select PCI

	select PCI
@@ -86,7 +79,6 @@ config KATMAI 
config RAINIER

config RAINIER

	bool "Rainier"

	bool "Rainier"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440GRX

	select 440GRX

	select PCI

	select PCI
@@ -96,7 +88,6 @@ config RAINIER 
config WARP

config WARP

	bool "PIKA Warp"

	bool "PIKA Warp"

	depends on 44x

	depends on 44x

	default n

	select 440EP

	select 440EP

	help

	help

	  This option enables support for the PIKA Warp(tm) Appliance. The Warp

	  This option enables support for the PIKA Warp(tm) Appliance. The Warp
@@ -109,7 +100,6 @@ config WARP 
config ARCHES

config ARCHES

	bool "Arches"

	bool "Arches"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 460EX # Odd since it uses 460GT but the effects are the same

	select 460EX # Odd since it uses 460GT but the effects are the same

	select PCI

	select PCI
@@ -120,7 +110,6 @@ config ARCHES 
config CANYONLANDS

config CANYONLANDS

	bool "Canyonlands"

	bool "Canyonlands"

	depends on 44x

	depends on 44x

	default n

	select 460EX

	select 460EX

	select PCI

	select PCI

	select PPC4xx_PCI_EXPRESS

	select PPC4xx_PCI_EXPRESS
@@ -134,7 +123,6 @@ config CANYONLANDS 
config GLACIER

config GLACIER

	bool "Glacier"

	bool "Glacier"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 460EX # Odd since it uses 460GT but the effects are the same

	select 460EX # Odd since it uses 460GT but the effects are the same

	select PCI

	select PCI
@@ -147,7 +135,6 @@ config GLACIER 
config REDWOOD

config REDWOOD

	bool "Redwood"

	bool "Redwood"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 460SX

	select 460SX

	select PCI

	select PCI
@@ -160,7 +147,6 @@ config REDWOOD 
config EIGER

config EIGER

	bool "Eiger"

	bool "Eiger"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 460SX

	select 460SX

	select PCI

	select PCI
@@ -172,7 +158,6 @@ config EIGER 
config YOSEMITE

config YOSEMITE

	bool "Yosemite"

	bool "Yosemite"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440EP

	select 440EP

	select PCI

	select PCI
@@ -182,7 +167,6 @@ config YOSEMITE 
config ISS4xx

config ISS4xx

	bool "ISS 4xx Simulator"

	bool "ISS 4xx Simulator"

	depends on (44x || 40x)

	depends on (44x || 40x)

	default n

	select 405GP if 40x

	select 405GP if 40x

	select 440GP if 44x && !PPC_47x

	select 440GP if 44x && !PPC_47x

	select PPC_FPU

	select PPC_FPU
@@ -193,7 +177,6 @@ config ISS4xx 
config CURRITUCK

config CURRITUCK

	bool "IBM Currituck (476fpe) Support"

	bool "IBM Currituck (476fpe) Support"

	depends on PPC_47x

	depends on PPC_47x

	default n

	select SWIOTLB

	select SWIOTLB

	select 476FPE

	select 476FPE

	select PPC4xx_PCI_EXPRESS

	select PPC4xx_PCI_EXPRESS
@@ -203,7 +186,6 @@ config CURRITUCK 
config FSP2

config FSP2

	bool "IBM FSP2 (476fpe) Support"

	bool "IBM FSP2 (476fpe) Support"

	depends on PPC_47x

	depends on PPC_47x

	default n

	select 476FPE

	select 476FPE

	select IBM_EMAC_EMAC4 if IBM_EMAC

	select IBM_EMAC_EMAC4 if IBM_EMAC

	select IBM_EMAC_RGMII if IBM_EMAC

	select IBM_EMAC_RGMII if IBM_EMAC
@@ -215,7 +197,6 @@ config FSP2 
config AKEBONO

config AKEBONO

	bool "IBM Akebono (476gtr) Support"

	bool "IBM Akebono (476gtr) Support"

	depends on PPC_47x

	depends on PPC_47x

	default n

	select SWIOTLB

	select SWIOTLB

	select 476FPE

	select 476FPE

	select PPC4xx_PCI_EXPRESS

	select PPC4xx_PCI_EXPRESS
@@ -241,7 +222,6 @@ config AKEBONO 
config ICON

config ICON

	bool "Icon"

	bool "Icon"

	depends on 44x

	depends on 44x

	default n

	select PPC44x_SIMPLE

	select PPC44x_SIMPLE

	select 440SPe

	select 440SPe

	select PCI

	select PCI
@@ -252,7 +232,6 @@ config ICON 
config XILINX_VIRTEX440_GENERIC_BOARD

config XILINX_VIRTEX440_GENERIC_BOARD

	bool "Generic Xilinx Virtex 5 FXT board support"

	bool "Generic Xilinx Virtex 5 FXT board support"

	depends on 44x

	depends on 44x

	default n

	select XILINX_VIRTEX_5_FXT

	select XILINX_VIRTEX_5_FXT

	select XILINX_INTC

	select XILINX_INTC

	help

	help
@@ -280,7 +259,6 @@ config XILINX_ML510 
config PPC44x_SIMPLE

config PPC44x_SIMPLE

	bool "Simple PowerPC 44x board support"

	bool "Simple PowerPC 44x board support"

	depends on 44x

	depends on 44x

	default n

	help

	help

	  This option enables the simple PowerPC 44x platform support.

	  This option enables the simple PowerPC 44x platform support.

arch/powerpc/platforms/82xx/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ endif 




config PQ2ADS

config PQ2ADS

	bool

	bool

	default n





config 8260

config 8260

	bool

	bool