summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-bsp
diff options
context:
space:
mode:
authorXo Wang <xow@google.com>2017-02-08 11:29:29 -0800
committerJoel Stanley <joel@jms.id.au>2017-02-13 17:54:40 +1030
commitc8288f4e0eb9961b1af17f05a71d9eb66ac85bee (patch)
tree1a6f37f7fd5b9cb53d0a70fefb32419634cad17f /meta-openbmc-bsp
parent17064cb6eb2f0ae36f7eca9ebda531fe82fb86a0 (diff)
downloadtalos-openbmc-c8288f4e0eb9961b1af17f05a71d9eb66ac85bee.tar.gz
talos-openbmc-c8288f4e0eb9961b1af17f05a71d9eb66ac85bee.zip
meta-aspeed: Add kernel panic timeout
Set a one-second timeout observed by the kernel after panicking. The system will reset after the timeout is up. The default timeout is 0, which means to wait indefinitely after panic. Fixes openbmc/openbmc#1114 Signed-off-by: Xo Wang <xow@google.com> Change-Id: I2eec2113fd7598f84dd91412b212ecc2a6949214 Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'meta-openbmc-bsp')
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig1
-rw-r--r--meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
index 2b9ae8f16..aad4358a3 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2400/recipes-kernel/linux/linux-obmc/defconfig
@@ -172,6 +172,7 @@ CONFIG_NLS_UTF8=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_STRIP_ASM_SYMS=y
CONFIG_DEBUG_FS=y
+CONFIG_PANIC_TIMEOUT=1
# CONFIG_SCHED_DEBUG is not set
# CONFIG_FTRACE is not set
CONFIG_DEBUG_USER=y
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
index 9eb1366dc..211e69df3 100644
--- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
+++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc/defconfig
@@ -176,6 +176,7 @@ CONFIG_NLS_UTF8=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_STRIP_ASM_SYMS=y
CONFIG_DEBUG_FS=y
+CONFIG_PANIC_TIMEOUT=1
# CONFIG_SCHED_DEBUG is not set
# CONFIG_FTRACE is not set
CONFIG_DEBUG_USER=y
OpenPOWER on IntegriCloud