diff options
| author | Andrew Jeffery <andrew@aj.id.au> | 2018-04-21 10:07:44 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-05-01 04:33:10 +0300 |
| commit | 8de079015e5ea8dc3883c466afd0d4e0de3c8ac1 (patch) | |
| tree | a027070e0a07ba31fd81058719672a8a5921675d | |
| parent | 6a7aa19179d4c314e70834dd38da7c7e39716afe (diff) | |
| download | openbmc-8de079015e5ea8dc3883c466afd0d4e0de3c8ac1.tar.xz | |
kernel: Add phosphor-wdt-on-panic KERNEL_FEATURE
phosphor-wdt-on-panic configures the kernel with an infinite panic
timeout, with the expectation that the hardware watchdog will bite and
reset the BMC. On Witherspoon systems this allows the SoC to boot from
the alternate BMC firmware flash device.
Change-Id: I45f5c5175484a2c386f5104194f16d8d6fa0aec9
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
3 files changed, 6 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc index 271f32508..274db26a4 100644 --- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc @@ -12,6 +12,8 @@ SRC_URI += "file://phosphor-gpio-keys.scc" SRC_URI += "file://phosphor-gpio-keys.cfg" SRC_URI += "file://phosphor-vlan.scc" SRC_URI += "file://phosphor-vlan.cfg" +SRC_URI += "file://phosphor-wdt-on-panic.scc" +SRC_URI += "file://phosphor-wdt-on-panic.cfg" SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch" diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg new file mode 100644 index 000000000..329b4df4b --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg @@ -0,0 +1,2 @@ +CONFIG_PANIC_ON_OOPS=y +CONFIG_PANIC_TIMEOUT=0 diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc new file mode 100644 index 000000000..7fc650799 --- /dev/null +++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc @@ -0,0 +1,2 @@ +define KFEATURE_DESCRIPTION "Require watchdog to reset SoC on panic" +kconf non-hardware phosphor-wdt-on-panic.cfg |