aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2007-12-11 13:49:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-01-28 13:19:00 +0900
commitd7ef4fb3acd1c1b141202c728ab3a78140a44eb7 (patch)
tree5fe3e2364b9c9de10f1b44eb0d14adcffec3f203 /arch
parentsh: Kill off superfluous __KERNEL__ check in asm/elf.h. (diff)
downloadlinux-dev-d7ef4fb3acd1c1b141202c728ab3a78140a44eb7.tar.xz
linux-dev-d7ef4fb3acd1c1b141202c728ab3a78140a44eb7.zip
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: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/Kconfig45
-rw-r--r--arch/sh/Kconfig.cpu20
-rw-r--r--arch/sh/Kconfig.debug15
3 files changed, 34 insertions, 46 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index f645f8416f1c..538631ca10a6 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -21,8 +21,7 @@ config SUPERH64
def_bool y if CPU_SH5
config RWSEM_GENERIC_SPINLOCK
- bool
- default y
+ def_bool y
config RWSEM_XCHGADD_ALGORITHM
bool
@@ -32,24 +31,19 @@ config GENERIC_BUG
depends on BUG && SUPERH32
config GENERIC_FIND_NEXT_BIT
- bool
- default y
+ def_bool y
config GENERIC_HWEIGHT
- bool
- default y
+ def_bool y
config GENERIC_HARDIRQS
- bool
- default y
+ def_bool y
config GENERIC_IRQ_PROBE
- bool
- default y
+ def_bool y
config GENERIC_CALIBRATE_DELAY
- bool
- default y
+ def_bool y
config GENERIC_IOMAP
bool
@@ -80,20 +74,16 @@ config ARCH_MAY_HAVE_PC_FDC
bool
config STACKTRACE_SUPPORT
- bool
- default y
+ def_bool y
config LOCKDEP_SUPPORT
- bool
- default y
+ def_bool y
config ARCH_HAS_ILOG2_U32
- bool
- default n
+ def_bool n
config ARCH_HAS_ILOG2_U64
- bool
- default n
+ def_bool n
config ARCH_NO_VIRT_TO_BUS
def_bool y
@@ -530,25 +520,25 @@ source "arch/sh/boards/magicpanelr2/Kconfig"
menu "Timer and clock configuration"
config SH_TMU
- bool "TMU timer support"
+ def_bool y
+ prompt "TMU timer support"
depends on CPU_SH3 || CPU_SH4
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
- default y
help
This enables the use of the TMU as the system timer.
config SH_CMT
- bool "CMT timer support"
+ def_bool y
+ prompt "CMT timer support"
depends on CPU_SH2
- default y
help
This enables the use of the CMT as the system timer.
config SH_MTU2
- bool "MTU2 timer support"
+ def_bool n
+ prompt "MTU2 timer support"
depends on CPU_SH2A
- default n
help
This enables the use of the MTU2 as the system timer.
@@ -612,9 +602,8 @@ source "arch/sh/drivers/Kconfig"
endmenu
config ISA_DMA_API
- bool
+ def_bool y
depends on SH_MPC1211
- default y
menu "Kernel features"
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu
index ef398535caf8..d850184d0694 100644
--- a/arch/sh/Kconfig.cpu
+++ b/arch/sh/Kconfig.cpu
@@ -16,9 +16,9 @@ config CPU_BIG_ENDIAN
endchoice
config SH_FPU
- bool "FPU support"
+ def_bool y
+ prompt "FPU support"
depends on CPU_HAS_FPU
- default y
help
Selecting this option will enable support for SH processors that
have FPU units (ie, SH77xx).
@@ -30,18 +30,18 @@ config SH64_FPU_DENORM_FLUSH
depends on SH_FPU && SUPERH64
config SH_FPU_EMU
- bool "FPU emulation support"
+ def_bool n
+ prompt "FPU emulation support"
depends on !SH_FPU && EXPERIMENTAL
- default n
help
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
want to say N.
config SH_DSP
- bool "DSP support"
+ def_bool y
+ prompt "DSP support"
depends on CPU_HAS_DSP
- default y
help
Selecting this option will enable support for SH processors that
have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
@@ -49,9 +49,9 @@ config SH_DSP
This option must be set in order to enable the DSP.
config SH_ADC
- bool "ADC support"
+ def_bool y
+ prompt "ADC support"
depends on CPU_SH3
- default y
help
Selecting this option will allow the Linux kernel to use SH3 on-chip
ADC module.
@@ -76,9 +76,9 @@ config SPECULATIVE_EXECUTION
If unsure, say N.
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
- default y
config SH64_ID2815_WORKAROUND
bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index b0dcb240d798..2881d8471a17 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -1,8 +1,7 @@
menu "Kernel hacking"
config TRACE_IRQFLAGS_SUPPORT
- bool
- default y
+ def_bool y
source "lib/Kconfig.debug"
@@ -120,19 +119,19 @@ config COMPILE_OPTIONS
depends on MORE_COMPILE_OPTIONS
config KGDB_NMI
- bool "Enter KGDB on NMI"
- default n
+ def_bool n
+ prompt "Enter KGDB on NMI"
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
select SERIAL_CORE_CONSOLE
- default n
config KGDB_SYSRQ
- bool "Allow SysRq 'G' to enter KGDB"
+ def_bool y
+ prompt "Allow SysRq 'G' to enter KGDB"
depends on MAGIC_SYSRQ
- default y
comment "Serial port setup"