diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-bytedance/meta-g220a/recipes-phosphor | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-bytedance/meta-g220a/recipes-phosphor')
4 files changed, 8 insertions, 67 deletions
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console@.service index 1a1dfffa1..a4eed736d 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console@.service +++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console@.service @@ -4,15 +4,15 @@ BindsTo=dev-%i.device After=dev-%i.device [Service] -ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' +ExecStartPre=/bin/sh -c 'echo -n "uart3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart1' +ExecStartPre=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart3' +ExecStartPre=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart4' +ExecStartPre=/bin/sh -c 'echo -n "uart4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/io1' ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i -ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart1' -ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart3' -ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/uart4' -ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart_routing/io1' +ExecStopPost=/bin/sh -c 'echo -n "io1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart1' +ExecStopPost=/bin/sh -c 'echo -n "io3" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart3' +ExecStopPost=/bin/sh -c 'echo -n "io4" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/uart4' +ExecStopPost=/bin/sh -c 'echo -n "uart1" > /sys/bus/platform/drivers/aspeed-uart-routing/1e78909c.uart-routing/io1' SyslogIdentifier=obmc-console-server Restart=always diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend index 038e65ec8..4759a8db6 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -2,6 +2,5 @@ OBMC_IMAGE_EXTRA_INSTALL:append:g220a = " \ webui-vue \ me-time-sync \ static-mac-addr \ - phosphor-node-manager-proxy \ phosphor-virtual-sensor \ " diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch deleted file mode 100644 index 837982da2..000000000 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 086b098ea4160963cd09405fbdf6816bef095d16 Mon Sep 17 00:00:00 2001 -From: Lei YU <yulei.sh@bytedance.com> -Date: Tue, 15 Dec 2020 16:50:31 +0800 -Subject: [PATCH] Remove Total_Power sensor - -The Total_Power sensor is not used on g220a system. Remove it. -The sensor will be replaced by a virtual sensor. - -Tested: Verify the Total_Power sensor is gone on DBus. - -Signed-off-by: Lei YU <yulei.sh@bytedance.com> ---- - NodeManagerProxy.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/NodeManagerProxy.cpp b/NodeManagerProxy.cpp -index d9fb760..9dbd5da 100644 ---- a/NodeManagerProxy.cpp -+++ b/NodeManagerProxy.cpp -@@ -120,9 +120,9 @@ void createSensors() - // NM Statistics - // Global power statistics - configuredSensors.push_back(std::make_unique<PowerMetric>(server)); -- configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>( -- server, 0, 2040, "power", "Total_Power", globalPowerStats, -- entirePlatform, 0)); -+// configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>( -+// server, 0, 2040, "power", "Total_Power", globalPowerStats, -+// entirePlatform, 0)); - configuredSensors.push_back( - std::make_unique<GlobalPowerCpu>(server, 0, 510, "power", "CPU_Power", - globalPowerStats, cpuSubsystem, 0)); --- -2.25.1 - diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb deleted file mode 100644 index 4d9dd1b99..000000000 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Node Manager Proxy" -DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \ -with Management Engine via IPMB" - -SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" -SRCREV = "23590b428ea26e0ed4b8225015471b962e3b3704" -PV = "0.1+git${SRCPV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -SYSTEMD_SERVICE:${PN} = "node-manager-proxy.service" - -DEPENDS = "sdbusplus \ - phosphor-logging \ - boost" - -S = "${WORKDIR}/git/" -inherit cmake systemd - -SRC_URI:append = " \ - file://0001-Remove-Total_Power-sensor.patch \ -" |