diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-ibm/conf/machine/mihawk.conf | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ibm/conf/machine/mihawk.conf')
| -rw-r--r-- | meta-ibm/conf/machine/mihawk.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index e5485c3be..efcf7717d 100644 --- a/meta-ibm/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -1,6 +1,5 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -KERNEL_FEATURES_append = " phosphor-wdt-on-panic" UBOOT_MACHINE = "ast_g5_ncsi_config" |