aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@gmail.com>2022-05-01 14:10:18 +0200
committerChristian Lamparter <chunkeey@gmail.com>2022-05-07 14:31:21 +0200
commitafcb6b1524e4987c9b6ed9f870f40e2ae8ddb368 (patch)
treed938c7d70b5f52d8eb69efb6546d12e6f3a00140
parentcb203adda00118501ecf6c74b126abe5fb851e71 (diff)
downloadupstream-afcb6b1524e4987c9b6ed9f870f40e2ae8ddb368.tar.gz
upstream-afcb6b1524e4987c9b6ed9f870f40e2ae8ddb368.tar.bz2
upstream-afcb6b1524e4987c9b6ed9f870f40e2ae8ddb368.zip
armvirt: 64: enable driver for QEMU' supported watchdog
QEMU can emulate several watchdogs: aspeed SoC, i6300esb, ib700wdt, imx2, cmsdk-apb and sbsa_gwdt. Out of these, the ARM SBSA Generic Watchdog (sbsa_gwdt) makes the most sense for the armvirt' 64 target. Both imx2 and aspeed are guarded by special vendor specific CONFIG_ in the upstream kernel. Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-rw-r--r--target/linux/armvirt/64/config-5.102
-rw-r--r--target/linux/armvirt/64/config-5.152
2 files changed, 4 insertions, 0 deletions
diff --git a/target/linux/armvirt/64/config-5.10 b/target/linux/armvirt/64/config-5.10
index 1389a2a60a..8c29bdc017 100644
--- a/target/linux/armvirt/64/config-5.10
+++ b/target/linux/armvirt/64/config-5.10
@@ -36,6 +36,7 @@ CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+CONFIG_ARM_SBSA_WATCHDOG=y
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -147,4 +148,5 @@ CONFIG_VEXPRESS_CONFIG=y
CONFIG_VIDEOMODE_HELPERS=y
CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
CONFIG_VMAP_STACK=y
+CONFIG_WATCHDOG_CORE=y
CONFIG_ZONE_DMA32=y
diff --git a/target/linux/armvirt/64/config-5.15 b/target/linux/armvirt/64/config-5.15
index 5818dcaf70..c1047c8009 100644
--- a/target/linux/armvirt/64/config-5.15
+++ b/target/linux/armvirt/64/config-5.15
@@ -38,6 +38,7 @@ CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
+CONFIG_ARM_SBSA_WATCHDOG=y
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -147,4 +148,5 @@ CONFIG_VEXPRESS_CONFIG=y
CONFIG_VIDEOMODE_HELPERS=y
CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
CONFIG_VMAP_STACK=y
+CONFIG_WATCHDOG_CORE=y
CONFIG_ZONE_DMA32=y