summaryrefslogtreecommitdiff
path: root/recipes-kernel
diff options
context:
space:
mode:
authorMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-02-09 13:59:15 +0200
committerMykyta Dorokhin <mykyta.dorokhin@globallogic.com>2021-02-09 13:59:15 +0200
commitfbd9157b8021689f6953db7eabb2256e3bdbebbc (patch)
tree5b373107d8488a184261653da056d96e63de5537 /recipes-kernel
parent9c69c4f074fc8a9bfaa21ffd8f9d461a12274354 (diff)
parent983cebf2358f99735cbcd67954e2b08540ff54d0 (diff)
downloadmeta-multitech-atmel-fbd9157b8021689f6953db7eabb2256e3bdbebbc.tar.gz
meta-multitech-atmel-fbd9157b8021689f6953db7eabb2256e3bdbebbc.tar.bz2
meta-multitech-atmel-fbd9157b8021689f6953db7eabb2256e3bdbebbc.zip
Merge remote-tracking branch 'origin/dunfell' into md/linux-5.4.81
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/driver.inc1
-rw-r--r--recipes-kernel/linux/linux-at91_4.9.87.bb3
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-kernel/linux/driver.inc b/recipes-kernel/linux/driver.inc
index 823997b..5e21ed6 100644
--- a/recipes-kernel/linux/driver.inc
+++ b/recipes-kernel/linux/driver.inc
@@ -11,7 +11,6 @@ DRIVER_LOAD_ALL_MACHINES = " \
KERNEL_MODULE_AUTOLOAD_mtcdt += " \
${DRIVER_LOAD_ALL_MACHINES} \
g_serial \
- softdog \
"
diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb
index 7811947..ba3c1de 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -19,7 +19,7 @@ RDEPENDS_kernel-modules_remove = "kernel-module-softdog"
FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
-PR = "r12"
+PR = "r13"
PKGR_kernel-module-i2c-at91 = "${PR}a${EXTENDPRAUTO}"
PKGR_kernel-module-atmel-mci = "${PR}a${EXTENDPRAUTO}"
KERNEL_VERSION = "${PV}"
@@ -78,6 +78,7 @@ SRC_URI_append_mtr = "\
"
KERNEL_MODULE_AUTOLOAD_mtcap_append += "i2c-dev"
KERNEL_MODULE_AUTOLOAD_mtcdt_append += "i2c-dev"
+KERNEL_MODULE_AUTOLOAD_append += "softdog"
DTB_APPEND_mtcdt = "mtcdt"
DTB_APPEND_mtrv1 = "mtrv1"