diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-10 16:03:00 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-10 16:03:00 +0100 |
commit | 6ff587c95ebabdd4162466a23e659b445979c802 (patch) | |
tree | 3a3b943056f628ab6412e7651fb9f53441feaa94 | |
parent | 3ccce9f9a1b7bb22878c61de1256cb5ec3413d5a (diff) | |
parent | 9f6d4645bc8d589f8aad1ad818a0585669248b57 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r-- | target/linux/config/Config.in.watchdog | 11 | ||||
-rw-r--r-- | target/mipsel/sys-available/mikrotik-rb532 | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 69e54e129..08e884a01 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -61,6 +61,17 @@ config ADK_KERNEL_GEODE_WDT help Geode watchdog. +config ADK_KERNEL_RC32434_WDT + prompt ".................................. IDT RC32434 Hardware Watchdog" + boolean + select ADK_KERNEL_WATCHDOG + default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default n + depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532 + help + Support for the hardware watchdog inside + Routerboard 532's SoC, the IDT RC32434. + config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG prompt "kmod-softdog...................... Software watchdog" tristate diff --git a/target/mipsel/sys-available/mikrotik-rb532 b/target/mipsel/sys-available/mikrotik-rb532 index 3e220428f..c73ef5f83 100644 --- a/target/mipsel/sys-available/mikrotik-rb532 +++ b/target/mipsel/sys-available/mikrotik-rb532 @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_CF select ADK_TARGET_WITH_NAND + select ADK_TARGET_WITH_LEDS select ADK_KERNEL_MIKROTIK_RB532 help Support for Mikrotik RB532. |