Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 261259b2a8c2924cbe591697e740654734ec0f7b

Authored by Jan Engelhardt
Committed by Wim Van Sebroeck
1 parent 5aa15050a2

[WATCHDOG] Kconfig menuconfig patch 

Change Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to
enter the menu first.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

Showing 1 changed file with 59 additions and 62 deletions Side-by-side Diff

drivers/char/watchdog/Kconfig
Diff comments   View file @ 261259b
... ... @@ -2,9 +2,7 @@
2 2 # Watchdog device configuration
3 3 #
4 4  
5   -menu "Watchdog Cards"
6   -
7   -config WATCHDOG
  5 +menuconfig WATCHDOG
8 6 bool "Watchdog Timer Support"
9 7 ---help---
10 8 If you say Y here (and to one of the following options) and create a
11 9  
... ... @@ -28,9 +26,10 @@
28 26  
29 27 If unsure, say N.
30 28  
  29 +if WATCHDOG
  30 +
31 31 config WATCHDOG_NOWAYOUT
32 32 bool "Disable watchdog shutdown on close"
33   - depends on WATCHDOG
34 33 help
35 34 The default watchdog behaviour (which you get if you say N here) is
36 35 to stop the timer if the process managing it closes the file
37 36  
... ... @@ -43,13 +42,11 @@
43 42 #
44 43  
45 44 comment "Watchdog Device Drivers"
46   - depends on WATCHDOG
47 45  
48 46 # Architecture Independent
49 47  
50 48 config SOFT_WATCHDOG
51 49 tristate "Software watchdog"
52   - depends on WATCHDOG
53 50 help
54 51 A software monitoring watchdog. This will fail to reboot your system
55 52 from some situations that the hardware watchdog will recover
56 53  
... ... @@ -62,14 +59,14 @@
62 59  
63 60 config AT91RM9200_WATCHDOG
64 61 tristate "AT91RM9200 watchdog"
65   - depends on WATCHDOG && ARCH_AT91RM9200
  62 + depends on ARCH_AT91RM9200
66 63 help
67 64 Watchdog timer embedded into AT91RM9200 chips. This will reboot your
68 65 system when the timeout is reached.
69 66  
70 67 config 21285_WATCHDOG
71 68 tristate "DC21285 watchdog"
72   - depends on WATCHDOG && FOOTBRIDGE
  69 + depends on FOOTBRIDGE
73 70 help
74 71 The Intel Footbridge chip contains a built-in watchdog circuit. Say Y
75 72 here if you wish to use this. Alternatively say M to compile the
... ... @@ -83,7 +80,7 @@
83 80  
84 81 config 977_WATCHDOG
85 82 tristate "NetWinder WB83C977 watchdog"
86   - depends on WATCHDOG && FOOTBRIDGE && ARCH_NETWINDER
  83 + depends on FOOTBRIDGE && ARCH_NETWINDER
87 84 help
88 85 Say Y here to include support for the WB977 watchdog included in
89 86 NetWinder machines. Alternatively say M to compile the driver as
... ... @@ -93,7 +90,7 @@
93 90  
94 91 config IXP2000_WATCHDOG
95 92 tristate "IXP2000 Watchdog"
96   - depends on WATCHDOG && ARCH_IXP2000
  93 + depends on ARCH_IXP2000
97 94 help
98 95 Say Y here if to include support for the watchdog timer
99 96 in the Intel IXP2000(2400, 2800, 2850) network processors.
... ... @@ -104,7 +101,7 @@
104 101  
105 102 config IXP4XX_WATCHDOG
106 103 tristate "IXP4xx Watchdog"
107   - depends on WATCHDOG && ARCH_IXP4XX
  104 + depends on ARCH_IXP4XX
108 105 help
109 106 Say Y here if to include support for the watchdog timer
110 107 in the Intel IXP4xx network processors. This driver can
... ... @@ -120,7 +117,7 @@
120 117  
121 118 config S3C2410_WATCHDOG
122 119 tristate "S3C2410 Watchdog"
123   - depends on WATCHDOG && ARCH_S3C2410
  120 + depends on ARCH_S3C2410
124 121 help
125 122 Watchdog timer block in the Samsung S3C2410 chips. This will
126 123 reboot the system when the timer expires with the watchdog
... ... @@ -136,7 +133,7 @@
136 133  
137 134 config SA1100_WATCHDOG
138 135 tristate "SA1100/PXA2xx watchdog"
139   - depends on WATCHDOG && ( ARCH_SA1100 || ARCH_PXA )
  136 + depends on ARCH_SA1100 || ARCH_PXA
140 137 help
141 138 Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
142 139 reboot your system when timeout is reached.
... ... @@ -148,7 +145,7 @@
148 145  
149 146 config MPCORE_WATCHDOG
150 147 tristate "MPcore watchdog"
151   - depends on WATCHDOG && ARM_MPCORE_PLATFORM && LOCAL_TIMERS
  148 + depends on ARM_MPCORE_PLATFORM && LOCAL_TIMERS
152 149 help
153 150 Watchdog timer embedded into the MPcore system.
154 151  
... ... @@ -157,7 +154,7 @@
157 154  
158 155 config EP93XX_WATCHDOG
159 156 tristate "EP93xx Watchdog"
160   - depends on WATCHDOG && ARCH_EP93XX
  157 + depends on ARCH_EP93XX
161 158 help
162 159 Say Y here if to include support for the watchdog timer
163 160 embedded in the Cirrus Logic EP93xx family of devices.
164 161  
... ... @@ -167,14 +164,14 @@
167 164  
168 165 config OMAP_WATCHDOG
169 166 tristate "OMAP Watchdog"
170   - depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX)
  167 + depends on ARCH_OMAP16XX || ARCH_OMAP24XX
171 168 help
172 169 Support for TI OMAP1610/OMAP1710/OMAP2420 watchdog. Say 'Y' here to
173 170 enable the OMAP1610/OMAP1710 watchdog timer.
174 171  
175 172 config PNX4008_WATCHDOG
176 173 tristate "PNX4008 Watchdog"
177   - depends on WATCHDOG && ARCH_PNX4008
  174 + depends on ARCH_PNX4008
178 175 help
179 176 Say Y here if to include support for the watchdog timer
180 177 in the PNX4008 processor.
... ... @@ -187,7 +184,7 @@
187 184  
188 185 config ACQUIRE_WDT
189 186 tristate "Acquire SBC Watchdog Timer"
190   - depends on WATCHDOG && X86
  187 + depends on X86
191 188 ---help---
192 189 This is the driver for the hardware watchdog on Single Board
193 190 Computers produced by Acquire Inc (and others). This watchdog
... ... @@ -201,7 +198,7 @@
201 198  
202 199 config ADVANTECH_WDT
203 200 tristate "Advantech SBC Watchdog Timer"
204   - depends on WATCHDOG && X86
  201 + depends on X86
205 202 help
206 203 If you are configuring a Linux kernel for the Advantech single-board
207 204 computer, say `Y' here to support its built-in watchdog timer
... ... @@ -210,7 +207,7 @@
210 207  
211 208 config ALIM1535_WDT
212 209 tristate "ALi M1535 PMU Watchdog Timer"
213   - depends on WATCHDOG && X86 && PCI
  210 + depends on X86 && PCI
214 211 ---help---
215 212 This is the driver for the hardware watchdog on the ALi M1535 PMU.
216 213  
... ... @@ -221,7 +218,7 @@
221 218  
222 219 config ALIM7101_WDT
223 220 tristate "ALi M7101 PMU Computer Watchdog"
224   - depends on WATCHDOG && X86 && PCI
  221 + depends on X86 && PCI
225 222 help
226 223 This is the driver for the hardware watchdog on the ALi M7101 PMU
227 224 as used in the x86 Cobalt servers.
... ... @@ -233,7 +230,7 @@
233 230  
234 231 config SC520_WDT
235 232 tristate "AMD Elan SC520 processor Watchdog"
236   - depends on WATCHDOG && X86
  233 + depends on X86
237 234 help
238 235 This is the driver for the hardware watchdog built in to the
239 236 AMD "Elan" SC520 microcomputer commonly used in embedded systems.
... ... @@ -246,7 +243,7 @@
246 243  
247 244 config EUROTECH_WDT
248 245 tristate "Eurotech CPU-1220/1410 Watchdog Timer"
249   - depends on WATCHDOG && X86
  246 + depends on X86
250 247 help
251 248 Enable support for the watchdog timer on the Eurotech CPU-1220 and
252 249 CPU-1410 cards. These are PC/104 SBCs. Spec sheets and product
... ... @@ -254,7 +251,7 @@
254 251  
255 252 config IB700_WDT
256 253 tristate "IB700 SBC Watchdog Timer"
257   - depends on WATCHDOG && X86
  254 + depends on X86
258 255 ---help---
259 256 This is the driver for the hardware watchdog on the IB700 Single
260 257 Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
... ... @@ -270,7 +267,7 @@
270 267  
271 268 config IBMASR
272 269 tristate "IBM Automatic Server Restart"
273   - depends on WATCHDOG && X86
  270 + depends on X86
274 271 help
275 272 This is the driver for the IBM Automatic Server Restart watchdog
276 273 timer built-in into some eServer xSeries machines.
... ... @@ -280,7 +277,7 @@
280 277  
281 278 config WAFER_WDT
282 279 tristate "ICP Wafer 5823 Single Board Computer Watchdog"
283   - depends on WATCHDOG && X86
  280 + depends on X86
284 281 help
285 282 This is a driver for the hardware watchdog on the ICP Wafer 5823
286 283 Single Board Computer (and probably other similar models).
... ... @@ -290,7 +287,7 @@
290 287  
291 288 config I6300ESB_WDT
292 289 tristate "Intel 6300ESB Timer/Watchdog"
293   - depends on WATCHDOG && X86 && PCI
  290 + depends on X86 && PCI
294 291 ---help---
295 292 Hardware driver for the watchdog timer built into the Intel
296 293 6300ESB controller hub.
... ... @@ -300,7 +297,7 @@
300 297  
301 298 config ITCO_WDT
302 299 tristate "Intel TCO Timer/Watchdog"
303   - depends on WATCHDOG && (X86 || IA64) && PCI
  300 + depends on (X86 || IA64) && PCI
304 301 ---help---
305 302 Hardware driver for the intel TCO timer based watchdog devices.
306 303 These drivers are included in the Intel 82801 I/O Controller
... ... @@ -329,7 +326,7 @@
329 326  
330 327 config SC1200_WDT
331 328 tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
332   - depends on WATCHDOG && X86
  329 + depends on X86
333 330 help
334 331 This is a driver for National Semiconductor PC87307/PC97307 hardware
335 332 watchdog cards as found on the SC1200. This watchdog is mainly used
... ... @@ -343,7 +340,7 @@
343 340  
344 341 config SCx200_WDT
345 342 tristate "National Semiconductor SCx200 Watchdog"
346   - depends on WATCHDOG && SCx200 && PCI
  343 + depends on SCx200 && PCI
347 344 help
348 345 Enable the built-in watchdog timer support on the National
349 346 Semiconductor SCx200 processors.
... ... @@ -352,7 +349,7 @@
352 349  
353 350 config PC87413_WDT
354 351 tristate "NS PC87413 watchdog"
355   - depends on WATCHDOG && X86
  352 + depends on X86
356 353 ---help---
357 354 This is the driver for the hardware watchdog on the PC87413 chipset
358 355 This watchdog simply watches your kernel to make sure it doesn't
... ... @@ -366,7 +363,7 @@
366 363  
367 364 config 60XX_WDT
368 365 tristate "SBC-60XX Watchdog Timer"
369   - depends on WATCHDOG && X86
  366 + depends on X86
370 367 help
371 368 This driver can be used with the watchdog timer found on some
372 369 single board computers, namely the 6010 PII based computer.
... ... @@ -380,7 +377,7 @@
380 377  
381 378 config SBC8360_WDT
382 379 tristate "SBC8360 Watchdog Timer"
383   - depends on WATCHDOG && X86
  380 + depends on X86
384 381 ---help---
385 382  
386 383 This is the driver for the hardware watchdog on the SBC8360 Single
... ... @@ -393,7 +390,7 @@
393 390  
394 391 config CPU5_WDT
395 392 tristate "SMA CPU5 Watchdog"
396   - depends on WATCHDOG && X86
  393 + depends on X86
397 394 ---help---
398 395 TBD.
399 396 To compile this driver as a module, choose M here: the
... ... @@ -401,7 +398,7 @@
401 398  
402 399 config SMSC37B787_WDT
403 400 tristate "Winbond SMsC37B787 Watchdog Timer"
404   - depends on WATCHDOG && X86
  401 + depends on X86
405 402 ---help---
406 403 This is the driver for the hardware watchdog component on the
407 404 Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
... ... @@ -421,7 +418,7 @@
421 418  
422 419 config W83627HF_WDT
423 420 tristate "W83627HF Watchdog Timer"
424   - depends on WATCHDOG && X86
  421 + depends on X86
425 422 ---help---
426 423 This is the driver for the hardware watchdog on the W83627HF chipset
427 424 as used in Advantech PC-9578 and Tyan S2721-533 motherboards
... ... @@ -436,7 +433,7 @@
436 433  
437 434 config W83697HF_WDT
438 435 tristate "W83697HF/W83697HG Watchdog Timer"
439   - depends on WATCHDOG && X86
  436 + depends on X86
440 437 ---help---
441 438 This is the driver for the hardware watchdog on the W83697HF/HG
442 439 chipset as used in Dedibox/VIA motherboards (and likely others).
... ... @@ -451,7 +448,7 @@
451 448  
452 449 config W83877F_WDT
453 450 tristate "W83877F (EMACS) Watchdog Timer"
454   - depends on WATCHDOG && X86
  451 + depends on X86
455 452 ---help---
456 453 This is the driver for the hardware watchdog on the W83877F chipset
457 454 as used in EMACS PC-104 motherboards (and likely others). This
... ... @@ -466,7 +463,7 @@
466 463  
467 464 config W83977F_WDT
468 465 tristate "W83977F (PCM-5335) Watchdog Timer"
469   - depends on WATCHDOG && X86
  466 + depends on X86
470 467 ---help---
471 468 This is the driver for the hardware watchdog on the W83977F I/O chip
472 469 as used in AAEON's PCM-5335 SBC (and likely others). This
... ... @@ -479,7 +476,7 @@
479 476  
480 477 config MACHZ_WDT
481 478 tristate "ZF MachZ Watchdog"
482   - depends on WATCHDOG && X86
  479 + depends on X86
483 480 ---help---
484 481 If you are using a ZF Micro MachZ processor, say Y here, otherwise
485 482 N. This is the driver for the watchdog timer built-in on that
... ... @@ -492,7 +489,7 @@
492 489  
493 490 config SBC_EPX_C3_WATCHDOG
494 491 tristate "Winsystems SBC EPX-C3 watchdog"
495   - depends on WATCHDOG && X86
  492 + depends on X86
496 493 ---help---
497 494 This is the driver for the built-in watchdog timer on the EPX-C3
498 495 Single-board computer made by Winsystems, Inc.
499 496  
500 497  
501 498  
... ... @@ -515,19 +512,19 @@
515 512  
516 513 config 8xx_WDT
517 514 tristate "MPC8xx Watchdog Timer"
518   - depends on WATCHDOG && 8xx
  515 + depends on 8xx
519 516  
520 517 config 83xx_WDT
521 518 tristate "MPC83xx Watchdog Timer"
522   - depends on WATCHDOG && PPC_83xx
  519 + depends on PPC_83xx
523 520  
524 521 config MV64X60_WDT
525 522 tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
526   - depends on WATCHDOG && MV64X60
  523 + depends on MV64X60
527 524  
528 525 config BOOKE_WDT
529 526 bool "PowerPC Book-E Watchdog Timer"
530   - depends on WATCHDOG && (BOOKE || 4xx)
  527 + depends on BOOKE || 4xx
531 528 ---help---
532 529 Please see Documentation/watchdog/watchdog-api.txt for
533 530 more information.
... ... @@ -536,7 +533,7 @@
536 533  
537 534 config WATCHDOG_RTAS
538 535 tristate "RTAS watchdog"
539   - depends on WATCHDOG && PPC_RTAS
  536 + depends on PPC_RTAS
540 537 help
541 538 This driver adds watchdog support for the RTAS watchdog.
542 539  
... ... @@ -547,7 +544,7 @@
547 544  
548 545 config INDYDOG
549 546 tristate "Indy/I2 Hardware Watchdog"
550   - depends on WATCHDOG && SGI_IP22
  547 + depends on SGI_IP22
551 548 help
552 549 Hardware driver for the Indy's/I2's watchdog. This is a
553 550 watchdog timer that will reboot the machine after a 60 second
... ... @@ -556,7 +553,7 @@
556 553  
557 554 config WDT_RM9K_GPI
558 555 tristate "RM9000/GPI hardware watchdog"
559   - depends on WATCHDOG && CPU_RM9000
  556 + depends on CPU_RM9000
560 557 help
561 558 Watchdog implementation using the GPI hardware found on
562 559 PMC-Sierra RM9xxx CPUs.
... ... @@ -568,7 +565,7 @@
568 565  
569 566 config ZVM_WATCHDOG
570 567 tristate "z/VM Watchdog Timer"
571   - depends on WATCHDOG && S390
  568 + depends on S390
572 569 help
573 570 IBM s/390 and zSeries machines running under z/VM 5.1 or later
574 571 provide a virtual watchdog timer to their guest that cause a
... ... @@ -582,7 +579,7 @@
582 579  
583 580 config SH_WDT
584 581 tristate "SuperH Watchdog"
585   - depends on WATCHDOG && SUPERH
  582 + depends on SUPERH
586 583 help
587 584 This driver adds watchdog support for the integrated watchdog in the
588 585 SuperH processors. If you have one of these processors and wish
... ... @@ -609,7 +606,7 @@
609 606  
610 607 config WATCHDOG_CP1XXX
611 608 tristate "CP1XXX Hardware Watchdog support"
612   - depends on WATCHDOG && SPARC64 && PCI
  609 + depends on SPARC64 && PCI
613 610 ---help---
614 611 This is the driver for the hardware watchdog timers present on
615 612 Sun Microsystems CompactPCI models CP1400 and CP1500.
... ... @@ -623,7 +620,7 @@
623 620  
624 621 config WATCHDOG_RIO
625 622 tristate "RIO Hardware Watchdog support"
626   - depends on WATCHDOG && SPARC64 && PCI
  623 + depends on SPARC64 && PCI
627 624 help
628 625 Say Y here to support the hardware watchdog capability on Sun RIO
629 626 machines. The watchdog timeout period is normally one minute but
630 627  
... ... @@ -634,11 +631,11 @@
634 631 #
635 632  
636 633 comment "ISA-based Watchdog Cards"
637   - depends on WATCHDOG && ISA
  634 + depends on ISA
638 635  
639 636 config PCWATCHDOG
640 637 tristate "Berkshire Products ISA-PC Watchdog"
641   - depends on WATCHDOG && ISA
  638 + depends on ISA
642 639 ---help---
643 640 This is the driver for the Berkshire Products ISA-PC Watchdog card.
644 641 This card simply watches your kernel to make sure it doesn't freeze,
... ... @@ -654,7 +651,7 @@
654 651  
655 652 config MIXCOMWD
656 653 tristate "Mixcom Watchdog"
657   - depends on WATCHDOG && ISA
  654 + depends on ISA
658 655 ---help---
659 656 This is a driver for the Mixcom hardware watchdog cards. This
660 657 watchdog simply watches your kernel to make sure it doesn't freeze,
... ... @@ -668,7 +665,7 @@
668 665  
669 666 config WDT
670 667 tristate "WDT Watchdog timer"
671   - depends on WATCHDOG && ISA
  668 + depends on ISA
672 669 ---help---
673 670 If you have a WDT500P or WDT501P watchdog board, say Y here,
674 671 otherwise N. It is not possible to probe for this board, which means
675 672  
... ... @@ -698,11 +695,11 @@
698 695 #
699 696  
700 697 comment "PCI-based Watchdog Cards"
701   - depends on WATCHDOG && PCI
  698 + depends on PCI
702 699  
703 700 config PCIPCWATCHDOG
704 701 tristate "Berkshire Products PCI-PC Watchdog"
705   - depends on WATCHDOG && PCI
  702 + depends on PCI
706 703 ---help---
707 704 This is the driver for the Berkshire Products PCI-PC Watchdog card.
708 705 This card simply watches your kernel to make sure it doesn't freeze,
... ... @@ -717,7 +714,7 @@
717 714  
718 715 config WDTPCI
719 716 tristate "PCI-WDT500/501 Watchdog timer"
720   - depends on WATCHDOG && PCI
  717 + depends on PCI
721 718 ---help---
722 719 If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
723 720  
724 721  
... ... @@ -744,11 +741,11 @@
744 741 #
745 742  
746 743 comment "USB-based Watchdog Cards"
747   - depends on WATCHDOG && USB
  744 + depends on USB
748 745  
749 746 config USBPCWATCHDOG
750 747 tristate "Berkshire Products USB-PC Watchdog"
751   - depends on WATCHDOG && USB
  748 + depends on USB
752 749 ---help---
753 750 This is the driver for the Berkshire Products USB-PC Watchdog card.
754 751 This card simply watches your kernel to make sure it doesn't freeze,
... ... @@ -761,5 +758,5 @@
761 758  
762 759 Most people will say N.
763 760  
764   -endmenu
  761 +endif # WATCHDOG