aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2007-12-10 23:49:35 -0500
committerPaul Mundt <lethal@linux-sh.org>2008-01-27 23:19:00 -0500
commitd7ef4fb3acd1c1b141202c728ab3a78140a44eb7 (patch)
tree5fe3e2364b9c9de10f1b44eb0d14adcffec3f203 /arch
parent543d5afe5b425ef25a865656bfb76083515dc1cf (diff)
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
21 def_bool y if CPU_SH5 21 def_bool y if CPU_SH5
22 22
23config RWSEM_GENERIC_SPINLOCK 23config RWSEM_GENERIC_SPINLOCK
24 bool 24 def_bool y
25 default y
26 25
27config RWSEM_XCHGADD_ALGORITHM 26config RWSEM_XCHGADD_ALGORITHM
28 bool 27 bool
@@ -32,24 +31,19 @@ config GENERIC_BUG
32 depends on BUG && SUPERH32 31 depends on BUG && SUPERH32
33 32
34config GENERIC_FIND_NEXT_BIT 33config GENERIC_FIND_NEXT_BIT
35 bool 34 def_bool y
36 default y
37 35
38config GENERIC_HWEIGHT 36config GENERIC_HWEIGHT
39 bool 37 def_bool y
40 default y
41 38
42config GENERIC_HARDIRQS 39config GENERIC_HARDIRQS
43 bool 40 def_bool y
44 default y
45 41
46config GENERIC_IRQ_PROBE 42config GENERIC_IRQ_PROBE
47 bool 43 def_bool y
48 default y
49 44
50config GENERIC_CALIBRATE_DELAY 45config GENERIC_CALIBRATE_DELAY
51 bool 46 def_bool y
52 default y
53 47
54config GENERIC_IOMAP 48config GENERIC_IOMAP
55 bool 49 bool
@@ -80,20 +74,16 @@ config ARCH_MAY_HAVE_PC_FDC
80 bool 74 bool
81 75
82config STACKTRACE_SUPPORT 76config STACKTRACE_SUPPORT
83 bool 77 def_bool y
84 default y
85 78
86config LOCKDEP_SUPPORT 79config LOCKDEP_SUPPORT
87 bool 80 def_bool y
88 default y
89 81
90config ARCH_HAS_ILOG2_U32 82config ARCH_HAS_ILOG2_U32
91 bool 83 def_bool n
92 default n
93 84
94config ARCH_HAS_ILOG2_U64 85config ARCH_HAS_ILOG2_U64
95 bool 86 def_bool n
96 default n
97 87
98config ARCH_NO_VIRT_TO_BUS 88config ARCH_NO_VIRT_TO_BUS
99 def_bool y 89 def_bool y
@@ -530,25 +520,25 @@ source "arch/sh/boards/magicpanelr2/Kconfig"
530menu "Timer and clock configuration" 520menu "Timer and clock configuration"
531 521
532config SH_TMU 522config SH_TMU
533 bool "TMU timer support" 523 def_bool y
524 prompt "TMU timer support"
534 depends on CPU_SH3 || CPU_SH4 525 depends on CPU_SH3 || CPU_SH4
535 select GENERIC_TIME 526 select GENERIC_TIME
536 select GENERIC_CLOCKEVENTS 527 select GENERIC_CLOCKEVENTS
537 default y
538 help 528 help
539 This enables the use of the TMU as the system timer. 529 This enables the use of the TMU as the system timer.
540 530
541config SH_CMT 531config SH_CMT
542 bool "CMT timer support" 532 def_bool y
533 prompt "CMT timer support"
543 depends on CPU_SH2 534 depends on CPU_SH2
544 default y
545 help 535 help
546 This enables the use of the CMT as the system timer. 536 This enables the use of the CMT as the system timer.
547 537
548config SH_MTU2 538config SH_MTU2
549 bool "MTU2 timer support" 539 def_bool n
540 prompt "MTU2 timer support"
550 depends on CPU_SH2A 541 depends on CPU_SH2A
551 default n
552 help 542 help
553 This enables the use of the MTU2 as the system timer. 543 This enables the use of the MTU2 as the system timer.
554 544
@@ -612,9 +602,8 @@ source "arch/sh/drivers/Kconfig"
612endmenu 602endmenu
613 603
614config ISA_DMA_API 604config ISA_DMA_API
615 bool 605 def_bool y
616 depends on SH_MPC1211 606 depends on SH_MPC1211
617 default y
618 607
619menu "Kernel features" 608menu "Kernel features"
620 609
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
16endchoice 16endchoice
17 17
18config SH_FPU 18config SH_FPU
19 bool "FPU support" 19 def_bool y
20 prompt "FPU support"
20 depends on CPU_HAS_FPU 21 depends on CPU_HAS_FPU
21 default y
22 help 22 help
23 Selecting this option will enable support for SH processors that 23 Selecting this option will enable support for SH processors that
24 have FPU units (ie, SH77xx). 24 have FPU units (ie, SH77xx).
@@ -30,18 +30,18 @@ config SH64_FPU_DENORM_FLUSH
30 depends on SH_FPU && SUPERH64 30 depends on SH_FPU && SUPERH64
31 31
32config SH_FPU_EMU 32config SH_FPU_EMU
33 bool "FPU emulation support" 33 def_bool n
34 prompt "FPU emulation support"
34 depends on !SH_FPU && EXPERIMENTAL 35 depends on !SH_FPU && EXPERIMENTAL
35 default n
36 help 36 help
37 Selecting this option will enable support for software FPU emulation. 37 Selecting this option will enable support for software FPU emulation.
38 Most SH-3 users will want to say Y here, whereas most SH-4 users will 38 Most SH-3 users will want to say Y here, whereas most SH-4 users will
39 want to say N. 39 want to say N.
40 40
41config SH_DSP 41config SH_DSP
42 bool "DSP support" 42 def_bool y
43 prompt "DSP support"
43 depends on CPU_HAS_DSP 44 depends on CPU_HAS_DSP
44 default y
45 help 45 help
46 Selecting this option will enable support for SH processors that 46 Selecting this option will enable support for SH processors that
47 have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP). 47 have DSP units (ie, SH2-DSP, SH3-DSP, and SH4AL-DSP).
@@ -49,9 +49,9 @@ config SH_DSP
49 This option must be set in order to enable the DSP. 49 This option must be set in order to enable the DSP.
50 50
51config SH_ADC 51config SH_ADC
52 bool "ADC support" 52 def_bool y
53 prompt "ADC support"
53 depends on CPU_SH3 54 depends on CPU_SH3
54 default y
55 help 55 help
56 Selecting this option will allow the Linux kernel to use SH3 on-chip 56 Selecting this option will allow the Linux kernel to use SH3 on-chip
57 ADC module. 57 ADC module.
@@ -76,9 +76,9 @@ config SPECULATIVE_EXECUTION
76 If unsure, say N. 76 If unsure, say N.
77 77
78config SH64_USER_MISALIGNED_FIXUP 78config SH64_USER_MISALIGNED_FIXUP
79 bool "Fixup misaligned loads/stores occurring in user mode" 79 def_bool y
80 prompt "Fixup misaligned loads/stores occurring in user mode"
80 depends on SUPERH64 81 depends on SUPERH64
81 default y
82 82
83config SH64_ID2815_WORKAROUND 83config SH64_ID2815_WORKAROUND
84 bool "Include workaround for SH5-101 cut2 silicon defect ID2815" 84 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 @@
1menu "Kernel hacking" 1menu "Kernel hacking"
2 2
3config TRACE_IRQFLAGS_SUPPORT 3config TRACE_IRQFLAGS_SUPPORT
4 bool 4 def_bool y
5 default y
6 5
7source "lib/Kconfig.debug" 6source "lib/Kconfig.debug"
8 7
@@ -120,19 +119,19 @@ config COMPILE_OPTIONS
120 depends on MORE_COMPILE_OPTIONS 119 depends on MORE_COMPILE_OPTIONS
121 120
122config KGDB_NMI 121config KGDB_NMI
123 bool "Enter KGDB on NMI" 122 def_bool n
124 default n 123 prompt "Enter KGDB on NMI"
125 124
126config SH_KGDB_CONSOLE 125config SH_KGDB_CONSOLE
127 bool "Console messages through GDB" 126 def_bool n
127 prompt "Console messages through GDB"
128 depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y 128 depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y
129 select SERIAL_CORE_CONSOLE 129 select SERIAL_CORE_CONSOLE
130 default n
131 130
132config KGDB_SYSRQ 131config KGDB_SYSRQ
133 bool "Allow SysRq 'G' to enter KGDB" 132 def_bool y
133 prompt "Allow SysRq 'G' to enter KGDB"
134 depends on MAGIC_SYSRQ 134 depends on MAGIC_SYSRQ
135 default y
136 135
137comment "Serial port setup" 136comment "Serial port setup"
138 137