summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-01-20 16:42:25 +0200
committerMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-01-20 16:42:25 +0200
commit09c2dc320eec80a637b00c3f5a23f7e9466a3221 (patch)
tree1d04983e6df778a6324b7ab16883a598075137b3 /recipes-kernel/linux
parent8b57a1f5b9f1c28710c7eebb62d1f96692db5992 (diff)
downloadmeta-multitech-atmel-09c2dc320eec80a637b00c3f5a23f7e9466a3221.tar.gz
meta-multitech-atmel-09c2dc320eec80a637b00c3f5a23f7e9466a3221.tar.bz2
meta-multitech-atmel-09c2dc320eec80a637b00c3f5a23f7e9466a3221.zip
linux 5.4: add soft watchdog support (same as on 4.9.87)
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-at91-5.4.81/defconfig2
-rw-r--r--recipes-kernel/linux/linux-at91_5.4.81.bb1
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-kernel/linux/linux-at91-5.4.81/defconfig b/recipes-kernel/linux/linux-at91-5.4.81/defconfig
index bda78b6..47ab083 100644
--- a/recipes-kernel/linux/linux-at91-5.4.81/defconfig
+++ b/recipes-kernel/linux/linux-at91-5.4.81/defconfig
@@ -2419,7 +2419,7 @@ CONFIG_WATCHDOG_OPEN_TIMEOUT=0
#
# Watchdog Device Drivers
#
-# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SOFT_WATCHDOG=m
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_ZIIRAVE_WATCHDOG is not set
diff --git a/recipes-kernel/linux/linux-at91_5.4.81.bb b/recipes-kernel/linux/linux-at91_5.4.81.bb
index 9b3a2e9..a3151d5 100644
--- a/recipes-kernel/linux/linux-at91_5.4.81.bb
+++ b/recipes-kernel/linux/linux-at91_5.4.81.bb
@@ -11,6 +11,7 @@ inherit linux-append-dtb
KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS_kernel-modules_remove = "kernel-module-softdog"
FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
SRCREV = "6cb5b8839e5f8b9bdd69273bd396ded4f0edd09e"