summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Luebbe <jlu@pengutronix.de>2012-09-03 15:38:19 +0200
committerJan Luebbe <jlu@pengutronix.de>2012-09-03 15:38:19 +0200
commit1d4dec040dc844535721520d2531e3457bc59c01 (patch)
tree519a6d1ab3702d2aa344909be8b68702d08bfc8a
parentd70eaf35355a56a6ba32787042f03232dc5aa823 (diff)
downloadplatform-pengutronix-versatilepb-1d4dec040dc844535721520d2531e3457bc59c01.tar.gz
platform-pengutronix-versatilepb-1d4dec040dc844535721520d2531e3457bc59c01.tar.xz
kernel: enable watchdog
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
-rw-r--r--kernelconfig-3.5.320
-rwxr-xr-xrun1
2 files changed, 20 insertions, 1 deletions
diff --git a/kernelconfig-3.5.3 b/kernelconfig-3.5.3
index 86b5f0b..431bc00 100644
--- a/kernelconfig-3.5.3
+++ b/kernelconfig-3.5.3
@@ -1050,7 +1050,25 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ARM_SP805_WATCHDOG is not set
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+# CONFIG_ALIM7101_WDT is not set
+CONFIG_I6300ESB_WDT=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
CONFIG_SSB_POSSIBLE=y
#
diff --git a/run b/run
index fc693e5..93dac5b 100755
--- a/run
+++ b/run
@@ -81,5 +81,6 @@ ${QEMU_EXEC} ${QEMU_NOGRAPHIC} \
-redir tcp:${TELNET_EXTERNAL_PORT}:${PLATFORM_IP}:${TELNET_INTERNAL_PORT} \
-kernel ${PTXDIST_PLATFORMDIR}/images/linuximage \
-hda ${PTXDIST_PLATFORMDIR}/images/hd.img \
+ -watchdog i6300esb -watchdog-action poweroff \
-append "root=/dev/sda1 rootfs=ext2 console=ttyAMA0,115200 ro"