aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-07-20 16:13:43 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-07-23 13:42:49 -0400
commitc0e962f93d0b6ecc594dc75bb28ee744143cdbe4 (patch)
tree8abc81fc4dd14f863f70ca31b80799ee3e59fce5 /drivers
parent5c4eb61b375ce16fc7af5055d8ab7bc19e788361 (diff)
[WATCHDOG] Clean-up Kconfig+Makefile
Clean-up of the watchdog's Kconfig and makefile files. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/watchdog/Kconfig100
-rw-r--r--drivers/char/watchdog/Makefile40
2 files changed, 94 insertions, 46 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index d9c2eb055f0e..37bddc1802de 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -55,6 +55,8 @@ config SOFT_WATCHDOG
55 To compile this driver as a module, choose M here: the 55 To compile this driver as a module, choose M here: the
56 module will be called softdog. 56 module will be called softdog.
57 57
58# ALPHA Architecture
59
58# ARM Architecture 60# ARM Architecture
59 61
60config AT91RM9200_WATCHDOG 62config AT91RM9200_WATCHDOG
@@ -189,7 +191,7 @@ config PNX4008_WATCHDOG
189 191
190config IOP_WATCHDOG 192config IOP_WATCHDOG
191 tristate "IOP Watchdog" 193 tristate "IOP Watchdog"
192 depends on WATCHDOG && PLAT_IOP 194 depends on PLAT_IOP
193 select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X) 195 select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
194 help 196 help
195 Say Y here if to include support for the watchdog timer 197 Say Y here if to include support for the watchdog timer
@@ -205,7 +207,7 @@ config IOP_WATCHDOG
205 207
206config DAVINCI_WATCHDOG 208config DAVINCI_WATCHDOG
207 tristate "DaVinci watchdog" 209 tristate "DaVinci watchdog"
208 depends on WATCHDOG && ARCH_DAVINCI 210 depends on ARCH_DAVINCI
209 help 211 help
210 Say Y here if to include support for the watchdog timer 212 Say Y here if to include support for the watchdog timer
211 in the DaVinci DM644x/DM646x processors. 213 in the DaVinci DM644x/DM646x processors.
@@ -215,20 +217,22 @@ config DAVINCI_WATCHDOG
215 NOTE: once enabled, this timer cannot be disabled. 217 NOTE: once enabled, this timer cannot be disabled.
216 Say N if you are unsure. 218 Say N if you are unsure.
217 219
220# ARM26 Architecture
221
218# AVR32 Architecture 222# AVR32 Architecture
219 223
220config AT32AP700X_WDT 224config AT32AP700X_WDT
221 tristate "AT32AP700x watchdog" 225 tristate "AT32AP700x watchdog"
222 depends on WATCHDOG && CPU_AT32AP7000 226 depends on CPU_AT32AP7000
223 help 227 help
224 Watchdog timer embedded into AT32AP700x devices. This will reboot 228 Watchdog timer embedded into AT32AP700x devices. This will reboot
225 your system when the timeout is reached. 229 your system when the timeout is reached.
226 230
227# Blackfin Architecture 231# BLACKFIN Architecture
228 232
229config BFIN_WDT 233config BFIN_WDT
230 tristate "Blackfin On-Chip Watchdog Timer" 234 tristate "Blackfin On-Chip Watchdog Timer"
231 depends on WATCHDOG && BLACKFIN 235 depends on BLACKFIN
232 ---help--- 236 ---help---
233 If you say yes here you will get support for the Blackfin On-Chip 237 If you say yes here you will get support for the Blackfin On-Chip
234 Watchdog Timer. If you have one of these processors and wish to 238 Watchdog Timer. If you have one of these processors and wish to
@@ -237,6 +241,12 @@ config BFIN_WDT
237 To compile this driver as a module, choose M here: the 241 To compile this driver as a module, choose M here: the
238 module will be called bfin_wdt. 242 module will be called bfin_wdt.
239 243
244# CRIS Architecture
245
246# FRV Architecture
247
248# H8300 Architecture
249
240# X86 (i386 + ia64 + x86_64) Architecture 250# X86 (i386 + ia64 + x86_64) Architecture
241 251
242config ACQUIRE_WDT 252config ACQUIRE_WDT
@@ -565,16 +575,52 @@ config SBC_EPX_C3_WATCHDOG
565 To compile this driver as a module, choose M here: the 575 To compile this driver as a module, choose M here: the
566 module will be called sbc_epx_c3. 576 module will be called sbc_epx_c3.
567 577
568# PowerPC Architecture 578# M32R Architecture
569 579
570config 8xx_WDT 580# M68K Architecture
571 tristate "MPC8xx Watchdog Timer" 581
572 depends on 8xx 582# M68KNOMMU Architecture
583
584# MIPS Architecture
585
586config INDYDOG
587 tristate "Indy/I2 Hardware Watchdog"
588 depends on SGI_IP22
589 help
590 Hardware driver for the Indy's/I2's watchdog. This is a
591 watchdog timer that will reboot the machine after a 60 second
592 timer expired and no process has written to /dev/watchdog during
593 that time.
594
595config WDT_MTX1
596 tristate "MTX-1 Hardware Watchdog"
597 depends on MIPS_MTX1
598 help
599 Hardware driver for the MTX-1 boards. This is a watchdog timer that
600 will reboot the machine after a 100 seconds timer expired.
601
602config WDT_RM9K_GPI
603 tristate "RM9000/GPI hardware watchdog"
604 depends on CPU_RM9000
605 help
606 Watchdog implementation using the GPI hardware found on
607 PMC-Sierra RM9xxx CPUs.
608
609 To compile this driver as a module, choose M here: the
610 module will be called rm9k_wdt.
611
612# PARISC Architecture
613
614# POWERPC Architecture
573 615
574config MPC5200_WDT 616config MPC5200_WDT
575 tristate "MPC5200 Watchdog Timer" 617 tristate "MPC5200 Watchdog Timer"
576 depends on PPC_MPC52xx 618 depends on PPC_MPC52xx
577 619
620config 8xx_WDT
621 tristate "MPC8xx Watchdog Timer"
622 depends on 8xx
623
578config 83xx_WDT 624config 83xx_WDT
579 tristate "MPC83xx Watchdog Timer" 625 tristate "MPC83xx Watchdog Timer"
580 depends on PPC_83xx 626 depends on PPC_83xx
@@ -601,34 +647,6 @@ config WATCHDOG_RTAS
601 To compile this driver as a module, choose M here. The module 647 To compile this driver as a module, choose M here. The module
602 will be called wdrtas. 648 will be called wdrtas.
603 649
604# MIPS Architecture
605
606config INDYDOG
607 tristate "Indy/I2 Hardware Watchdog"
608 depends on SGI_IP22
609 help
610 Hardware driver for the Indy's/I2's watchdog. This is a
611 watchdog timer that will reboot the machine after a 60 second
612 timer expired and no process has written to /dev/watchdog during
613 that time.
614
615config WDT_MTX1
616 tristate "MTX-1 Hardware Watchdog"
617 depends on MIPS_MTX1
618 help
619 Hardware driver for the MTX-1 boards. This is a watchdog timer that
620 will reboot the machine after a 100 seconds timer expired.
621
622config WDT_RM9K_GPI
623 tristate "RM9000/GPI hardware watchdog"
624 depends on CPU_RM9000
625 help
626 Watchdog implementation using the GPI hardware found on
627 PMC-Sierra RM9xxx CPUs.
628
629 To compile this driver as a module, choose M here: the
630 module will be called rm9k_wdt.
631
632# S390 Architecture 650# S390 Architecture
633 651
634config ZVM_WATCHDOG 652config ZVM_WATCHDOG
@@ -643,7 +661,7 @@ config ZVM_WATCHDOG
643 To compile this driver as a module, choose M here. The module 661 To compile this driver as a module, choose M here. The module
644 will be called vmwatchdog. 662 will be called vmwatchdog.
645 663
646# SUPERH Architecture 664# SUPERH (sh + sh64) Architecture
647 665
648config SH_WDT 666config SH_WDT
649 tristate "SuperH Watchdog" 667 tristate "SuperH Watchdog"
@@ -670,6 +688,8 @@ config SH_WDT_MMAP
670 If you say Y here, user applications will be able to mmap the 688 If you say Y here, user applications will be able to mmap the
671 WDT/CPG registers. 689 WDT/CPG registers.
672 690
691# SPARC Architecture
692
673# SPARC64 Architecture 693# SPARC64 Architecture
674 694
675config WATCHDOG_CP1XXX 695config WATCHDOG_CP1XXX
@@ -694,6 +714,10 @@ config WATCHDOG_RIO
694 machines. The watchdog timeout period is normally one minute but 714 machines. The watchdog timeout period is normally one minute but
695 can be changed with a boot-time parameter. 715 can be changed with a boot-time parameter.
696 716
717# V850 Architecture
718
719# XTENSA Architecture
720
697# 721#
698# ISA-based Watchdog Cards 722# ISA-based Watchdog Cards
699# 723#
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index edbf30eecdf6..389f8b14ccc4 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_WDTPCI) += wdt_pci.o
22# USB-based Watchdog Cards 22# USB-based Watchdog Cards
23obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o 23obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o
24 24
25# ALPHA Architecture
26
25# ARM Architecture 27# ARM Architecture
26obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o 28obj-$(CONFIG_AT91RM9200_WATCHDOG) += at91rm9200_wdt.o
27obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o 29obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
@@ -38,12 +40,20 @@ obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
38obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o 40obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
39obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o 41obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
40 42
43# ARM26 Architecture
44
41# AVR32 Architecture 45# AVR32 Architecture
42obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o 46obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
43 47
44# Blackfin Architecture 48# BLACKFIN Architecture
45obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o 49obj-$(CONFIG_BFIN_WDT) += bfin_wdt.o
46 50
51# CRIS Architecture
52
53# FRV Architecture
54
55# H8300 Architecture
56
47# X86 (i386 + ia64 + x86_64) Architecture 57# X86 (i386 + ia64 + x86_64) Architecture
48obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o 58obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o
49obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o 59obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o
@@ -70,7 +80,20 @@ obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
70obj-$(CONFIG_MACHZ_WDT) += machzwd.o 80obj-$(CONFIG_MACHZ_WDT) += machzwd.o
71obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o 81obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
72 82
73# PowerPC Architecture 83# M32R Architecture
84
85# M68K Architecture
86
87# M68KNOMMU Architecture
88
89# MIPS Architecture
90obj-$(CONFIG_INDYDOG) += indydog.o
91obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
92obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
93
94# PARISC Architecture
95
96# POWERPC Architecture
74obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o 97obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
75obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o 98obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
76obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o 99obj-$(CONFIG_83xx_WDT) += mpc83xx_wdt.o
@@ -80,17 +103,18 @@ obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
80# PPC64 Architecture 103# PPC64 Architecture
81obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o 104obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
82 105
83# MIPS Architecture
84obj-$(CONFIG_INDYDOG) += indydog.o
85obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
86obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
87
88# S390 Architecture 106# S390 Architecture
89 107
90# SUPERH Architecture 108# SUPERH (sh + sh64) Architecture
91obj-$(CONFIG_SH_WDT) += shwdt.o 109obj-$(CONFIG_SH_WDT) += shwdt.o
92 110
111# SPARC Architecture
112
93# SPARC64 Architecture 113# SPARC64 Architecture
94 114
115# V850 Architecture
116
117# XTENSA Architecture
118
95# Architecture Independant 119# Architecture Independant
96obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o 120obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o