summaryrefslogtreecommitdiff
path: root/meta-phosphor/aspeed-layer
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/aspeed-layer')
-rwxr-xr-xmeta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook3
-rw-r--r--meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.cfg2
-rw-r--r--meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed/phosphor-wdt-on-panic.scc2
-rw-r--r--meta-phosphor/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend6
4 files changed, 7 insertions, 6 deletions
diff --git a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
index 0df6ff973..3f5a974b9 100755
--- a/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
+++ b/meta-phosphor/aspeed-layer/recipes-connectivity/jsnbd/jsnbd/state_hook
@@ -16,6 +16,9 @@ case "$config" in
0)
nbd_device=/dev/nbd0
;;
+1)
+ nbd_device=/dev/nbd1
+ ;;
*)
echo "invalid config $config" >&2
exit 1
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 ea70a4fe8..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,10 @@ 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"
+
+# OpenBMC loads in kernel features via other mechanisms so this check
+# in the kernel-yocto.bbclass is not required
+KERNEL_DANGLING_FEATURES_WARN_ONLY="1"