Commit d7ef4fb3 authored by Harvey Harrison's avatar Harvey Harrison Committed by Paul Mundt

sh: Use def_bool where possible.

Change occurances of:
	bool
	default X

to:
	def_bool X

Change ocurances of:
	bool "Foo"
	default X

to:
	def_bool X
	prompt "Foo"
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 543d5afe
...@@ -21,8 +21,7 @@ config SUPERH64 ...@@ -21,8 +21,7 @@ config SUPERH64
def_bool y if CPU_SH5 def_bool y if CPU_SH5
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool def_bool y
default y
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
...@@ -32,24 +31,19 @@ config GENERIC_BUG ...@@ -32,24 +31,19 @@ config GENERIC_BUG
depends on BUG && SUPERH32 depends on BUG && SUPERH32
config GENERIC_FIND_NEXT_BIT config GENERIC_FIND_NEXT_BIT
bool def_bool y
default y
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
bool def_bool y
default y
config GENERIC_HARDIRQS config GENERIC_HARDIRQS
bool def_bool y
default y
config GENERIC_IRQ_PROBE config GENERIC_IRQ_PROBE
bool def_bool y
default y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
bool def_bool y
default y
config GENERIC_IOMAP config GENERIC_IOMAP
bool bool
...@@ -80,20 +74,16 @@ config ARCH_MAY_HAVE_PC_FDC ...@@ -80,20 +74,16 @@ config ARCH_MAY_HAVE_PC_FDC
bool bool
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
bool def_bool y
default y
config LOCKDEP_SUPPORT config LOCKDEP_SUPPORT
bool def_bool y
default y
config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U32
bool def_bool n
default n
config ARCH_HAS_ILOG2_U64 config ARCH_HAS_ILOG2_U64
bool def_bool n
default n
config ARCH_NO_VIRT_TO_BUS config ARCH_NO_VIRT_TO_BUS
def_bool y def_bool y
...@@ -530,25 +520,25 @@ source "arch/sh/boards/magicpanelr2/Kconfig" ...@@ -530,25 +520,25 @@ source "arch/sh/boards/magicpanelr2/Kconfig"
menu "Timer and clock configuration" menu "Timer and clock configuration"
config SH_TMU config SH_TMU
bool "TMU timer support" def_bool y
prompt "TMU timer support"
depends on CPU_SH3 || CPU_SH4 depends on CPU_SH3 || CPU_SH4
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
default y
help help
This enables the use of the TMU as the system timer. This enables the use of the TMU as the system timer.
config SH_CMT config SH_CMT
bool "CMT timer support" def_bool y
prompt "CMT timer support"
depends on CPU_SH2 depends on CPU_SH2
default y
help help
This enables the use of the CMT as the system timer. This enables the use of the CMT as the system timer.
config SH_MTU2 config SH_MTU2
bool "MTU2 timer support" def_bool n
prompt "MTU2 timer support"
depends on CPU_SH2A depends on CPU_SH2A
default n
help help
This enables the use of the MTU2 as the system timer. This enables the use of the MTU2 as the system timer.
...@@ -612,9 +602,8 @@ source "arch/sh/drivers/Kconfig" ...@@ -612,9 +602,8 @@ source "arch/sh/drivers/Kconfig"
endmenu endmenu
config ISA_DMA_API config ISA_DMA_API
bool def_bool y
depends on SH_MPC1211 depends on SH_MPC1211
default y
menu "Kernel features" menu "Kernel features"
......
...@@ -16,9 +16,9 @@ config CPU_BIG_ENDIAN ...@@ -16,9 +16,9 @@ config CPU_BIG_ENDIAN
endchoice endchoice
config SH_FPU config SH_FPU
bool "FPU support" def_bool y
prompt "FPU support"
depends on CPU_HAS_FPU depends on CPU_HAS_FPU
default y
help help
Selecting this option will enable support for SH processors that Selecting this option will enable support for SH processors that
have FPU units (ie, SH77xx). have FPU units (ie, SH77xx).
...@@ -30,18 +30,18 @@ config SH64_FPU_DENORM_FLUSH ...@@ -30,18 +30,18 @@ config SH64_FPU_DENORM_FLUSH
depends on SH_FPU && SUPERH64 depends on SH_FPU && SUPERH64
config SH_FPU_EMU config SH_FPU_EMU
bool "FPU emulation support" def_bool n
prompt "FPU emulation support"
depends on !SH_FPU && EXPERIMENTAL depends on !SH_FPU && EXPERIMENTAL
default n
help help
Selecting this option will enable support for software FPU emulation. Selecting this option will enable support for software FPU emulation.
Most SH-3 users will want to say Y here, whereas most SH-4 users will Most SH-3 users will want to say Y here, whereas most SH-4 users will
want to say N. want to say N.
config SH_DSP config SH_DSP
bool "DSP support" def_bool y
prompt "DSP support"
depends on CPU_HAS_DSP depends on CPU_HAS_DSP
default y
help help
Selecting this option will enable support for SH processors that Selecting this option will enable support for SH processors that
have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP). have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
...@@ -49,9 +49,9 @@ config SH_DSP ...@@ -49,9 +49,9 @@ config SH_DSP
This option must be set in order to enable the DSP. This option must be set in order to enable the DSP.
config SH_ADC config SH_ADC
bool "ADC support" def_bool y
prompt "ADC support"
depends on CPU_SH3 depends on CPU_SH3
default y
help help
Selecting this option will allow the Linux kernel to use SH3 on-chip Selecting this option will allow the Linux kernel to use SH3 on-chip
ADC module. ADC module.
...@@ -76,9 +76,9 @@ config SPECULATIVE_EXECUTION ...@@ -76,9 +76,9 @@ config SPECULATIVE_EXECUTION
If unsure, say N. If unsure, say N.
config SH64_USER_MISALIGNED_FIXUP config SH64_USER_MISALIGNED_FIXUP
bool "Fixup misaligned loads/stores occurring in user mode" def_bool y
prompt "Fixup misaligned loads/stores occurring in user mode"
depends on SUPERH64 depends on SUPERH64
default y
config SH64_ID2815_WORKAROUND config SH64_ID2815_WORKAROUND
bool "Include workaround for SH5-101 cut2 silicon defect ID2815" bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
......
menu "Kernel hacking" menu "Kernel hacking"
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
bool def_bool y
default y
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
...@@ -120,19 +119,19 @@ config COMPILE_OPTIONS ...@@ -120,19 +119,19 @@ config COMPILE_OPTIONS
depends on MORE_COMPILE_OPTIONS depends on MORE_COMPILE_OPTIONS
config KGDB_NMI config KGDB_NMI
bool "Enter KGDB on NMI" def_bool n
default n prompt "Enter KGDB on NMI"
config SH_KGDB_CONSOLE config SH_KGDB_CONSOLE
bool "Console messages through GDB" def_bool n
prompt "Console messages through GDB"
depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y
select SERIAL_CORE_CONSOLE select SERIAL_CORE_CONSOLE
default n
config KGDB_SYSRQ config KGDB_SYSRQ
bool "Allow SysRq 'G' to enter KGDB" def_bool y
prompt "Allow SysRq 'G' to enter KGDB"
depends on MAGIC_SYSRQ depends on MAGIC_SYSRQ
default y
comment "Serial port setup" comment "Serial port setup"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment