wdt-on-panic: remove overrides from meta-phosphor

If these are needed, they really should be done within the meta-aspeed
layer. This was originally done to allow the BMC hardware watchdogs
to control the reboot of the BMC in error scenarios vs. the kernel auto
rebooting itself. This is causing issues on AST2600 hardware because the
watchdogs are not setup correctly. Kernel panics result in the BMC
becoming unusable and not rebooting, requiring a manual power cycle.

The goal with letting the hardware watchdogs control the reboot was that
fancy things like flash side switches could be performed for recovery
scenarios. However the end to end software stack for this was never fully
implemented so if a flash side switch did occur, there would be no
notice to the user of the system, and in most cases the BMC was still
inoperable because the network settings were missing.

For now, we should just go back to the defaults built into the
meta-aspeed layer which is to panic on oops and have the kernel
immediately reboot the BMC when a panic occurs.

Once we iron out the watchdog usage, we can look into changing these
back in the meta-aspeed layer if needed.

(From meta-phosphor rev: 7777a8eda2b4909f34605476813e1e364b0d5728)

Change-Id: I18a15a7769b27d6dd577bcc4e35cc9f60c4d3240
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

3 files changed, 0 insertions, 6 deletions

diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg
deleted file mode 100644
index 329b4df4b..000000000
--- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PANIC_ON_OOPS=y
-CONFIG_PANIC_TIMEOUT=0
diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc
deleted file mode 100644
index 7fc650799..000000000
--- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-define KFEATURE_DESCRIPTION "Require watchdog to reset SoC on panic"
-kconf non-hardware phosphor-wdt-on-panic.cfg
diff --git a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
index 8dd381e31..7401a1895 100644
--- a/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -4,8 +4,6 @@ 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"
 
 KERNEL_FEATURES_append = " phosphor-vlan"
 KERNEL_FEATURES_remove_qemuall = " phosphor-vlan"