SILABMC-253: Removed non-working boot override modes

2 files changed, 77 insertions, 0 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0007-Removed-non-working-boot-override-modes.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0007-Removed-non-working-boot-override-modes.patch
new file mode 100644
index 0000000000..e03346e147
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0007-Removed-non-working-boot-override-modes.patch
@@ -0,0 +1,76 @@
+From d85c785cf00be8efa5f9f52efd9d26dacfeac5b1 Mon Sep 17 00:00:00 2001
+From: Nikita Kosenkov <NKosenkov@IBS.RU>
+Date: Wed, 17 Aug 2022 15:08:43 +0300
+Subject: [PATCH] Removed non-working boot override modes
+
+This patch is relevant only for the CP2-5422 board.
+---
+ redfish-core/lib/systems.hpp | 26 +-------------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
+
+diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp
+index 81403370..d21389a5 100644
+--- a/redfish-core/lib/systems.hpp
++++ b/redfish-core/lib/systems.hpp
+@@ -593,19 +593,11 @@ inline std::string dbusToRfBootSource(const std::string& dbusSource)
+     {
+         return "None";
+     }
+-    if (dbusSource == "xyz.openbmc_project.Control.Boot.Source.Sources.Disk")
+-    {
+-        return "Hdd";
+-    }
+     if (dbusSource ==
+         "xyz.openbmc_project.Control.Boot.Source.Sources.ExternalMedia")
+     {
+         return "Cd";
+     }
+-    if (dbusSource == "xyz.openbmc_project.Control.Boot.Source.Sources.Network")
+-    {
+-        return "Pxe";
+-    }
+     if (dbusSource ==
+         "xyz.openbmc_project.Control.Boot.Source.Sources.RemovableMedia")
+     {
+@@ -649,10 +641,6 @@ inline std::string dbusToRfBootMode(const std::string& dbusMode)
+     {
+         return "None";
+     }
+-    if (dbusMode == "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe")
+-    {
+-        return "Diags";
+-    }
+     if (dbusMode == "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup")
+     {
+         return "BiosSetup";
+@@ -761,18 +749,6 @@ inline int assignBootParameters(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
+     {
+         return 0;
+     }
+-    if (rfSource == "Pxe")
+-    {
+-        bootSource = "xyz.openbmc_project.Control.Boot.Source.Sources.Network";
+-    }
+-    else if (rfSource == "Hdd")
+-    {
+-        bootSource = "xyz.openbmc_project.Control.Boot.Source.Sources.Disk";
+-    }
+-    else if (rfSource == "Diags")
+-    {
+-        bootMode = "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe";
+-    }
+     else if (rfSource == "Cd")
+     {
+         bootSource =
+@@ -895,7 +871,7 @@ inline void getBootOverrideMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp)
+         aResp->res
+             .jsonValue["Boot"]
+                       ["BootSourceOverrideTarget@Redfish.AllowableValues"] = {
+-            "None", "Pxe", "Hdd", "Cd", "Diags", "BiosSetup", "Usb"};
++            "None", "Cd", "Usb", "BiosSetup"};
+ 
+         if (bootModeStr !=
+             "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular")
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
index b0db511bfe..46cf6f3a30 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -7,6 +7,7 @@ SRC_URI += "\
     file://0004-configure-telemetry.patch \
     file://0005-Fix-keep-and-re-send-initial-negotiation-data-from-W.patch \
     file://0006-fix-bug-empty-pcie-functions.patch \
+    file://0007-Removed-non-working-boot-override-modes.patch \
     "
 
 EXTRA_OEMESON += "\