diff options
author | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-08-16 21:06:54 +0300 |
---|---|---|
committer | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-08-16 21:06:54 +0300 |
commit | f41b5cf652543c7e6b9d761351bc5418e1dee955 (patch) | |
tree | 3d7d2c7c8bfab4a7e097ed71112ae9171271c02f /meta-ibs/meta-common/recipes-phosphor/ipmi | |
parent | 057264bed82c9549d6aafce18c4242d3fceb607b (diff) | |
download | openbmc-f41b5cf652543c7e6b9d761351bc5418e1dee955.tar.xz |
Revert "SILABMC-246: Added reset OneTime override properties"
This reverts commit 057264bed82c9549d6aafce18c4242d3fceb607b.
Diffstat (limited to 'meta-ibs/meta-common/recipes-phosphor/ipmi')
2 files changed, 0 insertions, 44 deletions
diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Added-reset-OneTime-override-properties.patch b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Added-reset-OneTime-override-properties.patch deleted file mode 100644 index f278b3cb60..0000000000 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Added-reset-OneTime-override-properties.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 94ac5b836deb08fc206e48c47840e2bef1840a9b Mon Sep 17 00:00:00 2001 -From: Nikita Kosenkov <NKosenkov@IBS.RU> -Date: Tue, 16 Aug 2022 20:50:51 +0300 -Subject: [PATCH] Added reset OneTime override properties - ---- - chassishandler.cpp | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/chassishandler.cpp b/chassishandler.cpp -index 737d3d2..7623b3d 100644 ---- a/chassishandler.cpp -+++ b/chassishandler.cpp -@@ -1942,6 +1942,16 @@ ipmi::RspType<ipmi::message::Payload> - uint1_t{validFlag}, uint2_t{}, uint4_t{bootOption}, - uint1_t{}, cmosClear, uint8_t{}, uint8_t{}, - uint8_t{}); -+ -+ if(oneTimeEnabled) -+ { -+ log<level::INFO>("ipmiChassisGetSysBootOptions: Reset OneTime override properties"); -+ -+ setBootOneTime(ctx, false); -+ setBootMode(ctx, Mode::Modes::Regular); -+ setBootSource(ctx, Source::Sources::Default); -+ } -+ - return ipmi::responseSuccess(std::move(response)); - } - catch (const InternalFailure& e) -@@ -1990,6 +2000,7 @@ ipmi::RspType<ipmi::message::Payload> - return ipmi::responseParmNotSupported(); - } - } -+ - return ipmi::responseUnspecifiedError(); - } - --- -2.35.1 - diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 03cb368ffe..eb6ee2fcbb 100644 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += " file://0001-Added-reset-OneTime-override-properties.patch \" - do_install:append:ibs(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host |