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-amd/recipes-phosphor | |
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-amd/recipes-phosphor')
6 files changed, 38 insertions, 0 deletions
diff --git a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf new file mode 100644 index 000000000..88d84d7ca --- /dev/null +++ b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf @@ -0,0 +1,2 @@ +local-tty = ttyS0 +baud = 115200 diff --git a/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..7f9c460e2 --- /dev/null +++ b/meta-amd/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" +OBMC_CONSOLE_HOST_TTY = "ttyS0" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyS0.conf" + +do_install_append() { + # Remove upstream-provided configuration + rm -rf ${D}${sysconfdir}/${BPN} + + # Install the server configuration + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + +} diff --git a/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend new file mode 100644 index 000000000..83567e906 --- /dev/null +++ b/meta-amd/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +EXTRA_OECONF_append = " --enable-configure-dbus=yes" diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf new file mode 100644 index 000000000..c75186415 --- /dev/null +++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger/ethanolx/ttyS0.conf @@ -0,0 +1,7 @@ +SOCKET_ID= +BUF_MAXSIZE=3000 +BUF_MAXTIME=0 +FLUSH_FULL=false +HOST_STATE=/xyz/openbmc_project/state/host0 +OUT_DIR=/var/lib/obmc/hostlogs +MAX_FILES=10 diff --git a/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend new file mode 100644 index 000000000..9ae1d42c6 --- /dev/null +++ b/meta-amd/recipes-phosphor/logging/phosphor-hostlogger_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" + +# Default service instance to install (single-host mode) +DEFAULT_INSTANCE = "ttyS0" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://ttyS0.conf" + diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend new file mode 100644 index 000000000..4948cb4cb --- /dev/null +++ b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -0,0 +1,3 @@ +# Enable threshold monitoring +EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" |