summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-google/recipes-kernel/linux/files/gbmc-dev.cfg1
-rw-r--r--meta-google/recipes-kernel/linux/files/gbmc.cfg9
2 files changed, 10 insertions, 0 deletions
diff --git a/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg
index d37b1163ef..0576b440ac 100644
--- a/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg
+++ b/meta-google/recipes-kernel/linux/files/gbmc-dev.cfg
@@ -8,6 +8,7 @@ CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
CONFIG_STACK_TRACER=y
CONFIG_DYNAMIC_FTRACE=y
+CONFIG_TEST_LOCKUP=y
# We want to allow for sysrqs over the console
CONFIG_MAGIC_SYSRQ=y
diff --git a/meta-google/recipes-kernel/linux/files/gbmc.cfg b/meta-google/recipes-kernel/linux/files/gbmc.cfg
index c8a5364464..e2a44b1e34 100644
--- a/meta-google/recipes-kernel/linux/files/gbmc.cfg
+++ b/meta-google/recipes-kernel/linux/files/gbmc.cfg
@@ -64,3 +64,12 @@ CONFIG_PRINTK_TIME=y
CONFIG_WATCHDOG_SYSFS=y
CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT=y
CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+
+# All image debug features
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_TIMEOUT=10
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+CONFIG_WQ_WATCHDOG=y