From 31b3b43b5f5cb84a2b87816e0fcf2fbb401e33a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Jan 2006 02:04:35 +0000 Subject: [PATCH] add software watchdog changes from trunk SVN-Revision: 2858 --- openwrt/package/busybox/config/miscutils/Config.in | 2 +- openwrt/target/linux/Config.in | 7 +++++++ openwrt/target/linux/control/kmod-softdog.control | 6 ++++++ openwrt/target/linux/linux-2.4/Makefile | 4 ++++ openwrt/target/linux/linux-2.4/config/brcm | 2 +- 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 openwrt/target/linux/control/kmod-softdog.control diff --git a/openwrt/package/busybox/config/miscutils/Config.in b/openwrt/package/busybox/config/miscutils/Config.in index 072993b28d..77dc85cd05 100644 --- a/openwrt/package/busybox/config/miscutils/Config.in +++ b/openwrt/package/busybox/config/miscutils/Config.in @@ -188,7 +188,7 @@ config BUSYBOX_CONFIG_TIME config BUSYBOX_CONFIG_WATCHDOG bool "watchdog" - default n + default y help The watchdog utility is used with hardware or software watchdog device drivers. It opens the specified watchdog device special file diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in index d7d49e530c..e337ad02be 100644 --- a/openwrt/target/linux/Config.in +++ b/openwrt/target/linux/Config.in @@ -355,4 +355,11 @@ config BR2_PACKAGE_KMOD_PWC tristate "Kernel driver for USB Philips Cameras" default m +config BR2_PACKAGE_KMOD_SOFTDOG + tristate "Kernel driver for software watchdog" + default m + help + Kernel modules for software watchdog driver + + source "target/linux/package/Config.in" diff --git a/openwrt/target/linux/control/kmod-softdog.control b/openwrt/target/linux/control/kmod-softdog.control new file mode 100644 index 0000000000..88a7400572 --- /dev/null +++ b/openwrt/target/linux/control/kmod-softdog.control @@ -0,0 +1,6 @@ +Package: kmod-softdog +Priority: optional +Section: sys +Maintainer: OpenWrt Developers Team +Source: buildroot internal +Description: Kernel software watchdog driver diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index 133689659e..ff426fdaff 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -197,6 +197,10 @@ $(eval $(call KMOD_template,PWC,pwc,\ $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ )) +$(eval $(call KMOD_template,SOFTDOG,softdog,\ + $(MODULES_DIR)/kernel/drivers/char/softdog.o \ +)) + $(TARGETS): $(PACKAGE_DIR) $(PACKAGE_DIR): diff --git a/openwrt/target/linux/linux-2.4/config/brcm b/openwrt/target/linux/linux-2.4/config/brcm index 75c7f733e7..292f30fc72 100644 --- a/openwrt/target/linux/linux-2.4/config/brcm +++ b/openwrt/target/linux/linux-2.4/config/brcm @@ -947,7 +947,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y # CONFIG_60XX_WDT is not set # CONFIG_SC1200_WDT is not set # CONFIG_SCx200_WDT is not set -CONFIG_SOFT_WATCHDOG=y +CONFIG_SOFT_WATCHDOG=m # CONFIG_W83877F_WDT is not set # CONFIG_WDT is not set # CONFIG_WDTPCI is not set -- 2.30.2