summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kosenkov <NKosenkov@IBS.RU>2022-06-08 06:05:53 +0300
committerNikita Kosenkov <NKosenkov@IBS.RU>2022-06-14 13:31:51 +0300
commitb05f4049cbbfbe8fc69b8d8f97674760fbca36fe (patch)
treeba0ea2376bd93f9161993105813038587e890e35
parentcb01445f1802e13a3c0177a92150a683bc5b3d07 (diff)
downloadopenbmc-b05f4049cbbfbe8fc69b8d8f97674760fbca36fe.tar.xz
x86-power-control: undo all changes
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch41
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend1
2 files changed, 0 insertions, 42 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch
deleted file mode 100644
index 636f922227..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0001-x86-power-control-removed-the-conditions-for-startin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cf1bd45c8f33c0fb22113708e076f34784552d1f Mon Sep 17 00:00:00 2001
-From: "Nikita Kosenkov (IBS Group)" <nkosenkov@ibs.sila.ru>
-Date: Tue, 31 May 2022 06:51:46 +0300
-Subject: [PATCH] x86-power-control: removed the conditions for starting the
- power restore policy
-
----
- src/power_control.cpp | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/src/power_control.cpp b/src/power_control.cpp
-index 05aa45c..56346ed 100644
---- a/src/power_control.cpp
-+++ b/src/power_control.cpp
-@@ -2754,8 +2754,8 @@ int main(int argc, char* argv[])
-
- // Initialize the power state
- powerState = PowerState::off;
-+
- // Check power good
--
- if (powerOkConfig.type == ConfigType::GPIO)
- {
- if (psPowerOKLine.get_value() > 0 ||
-@@ -2772,11 +2772,9 @@ int main(int argc, char* argv[])
- powerState = PowerState::on;
- }
- }
-+
- // Check if we need to start the Power Restore policy
-- if (powerState != PowerState::on)
-- {
-- powerRestore.run();
-- }
-+ powerRestore.run();
-
- if (nmiOutLine)
- nmiSourcePropertyMonitor();
---
-2.35.1
-
diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
index 15e8a72f79..d8a4104b65 100644
--- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,7 +1,6 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI:append = " \
file://power-config-host0.json \
- file://0001-x86-power-control-removed-the-conditions-for-startin.patch \
"
RDEPENDS:${PN}:append = " bash"