Revert "[nrf fromtree] [nrfconnect] Improve SoftwareUpdateCompleted b…

…oot reason detection (project-chip#21851)" This reverts commit 2d06fd4.
Damian-Nordic · Aug 31, 2022 · dbeacc6 · dbeacc6
1 parent a7ba249
commit dbeacc6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 134 deletions.
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -31,9 +31,7 @@
 #include <drivers/hwinfo.h>
 #include <sys/util.h>
 
-#if CHIP_DEVICE_LAYER_TARGET_NRFCONNECT
-#include <platform/nrfconnect/Reboot.h>
-#elif defined(CONFIG_MCUBOOT_IMG_MANAGER)
+#ifdef CONFIG_MCUBOOT_IMG_MANAGER
 #include <dfu/mcuboot.h>
 #endif
 
@@ -90,12 +88,7 @@ BootReasonType DetermineBootReason()
 
     if (reason & RESET_SOFTWARE)
     {
-#if CHIP_DEVICE_LAYER_TARGET_NRFCONNECT
-        if (GetSoftwareRebootReason() == SoftwareRebootReason::kSoftwareUpdate)
-        {
-            return BootReasonType::kSoftwareUpdateCompleted;
-        }
-#elif defined(CONFIG_MCUBOOT_IMG_MANAGER)
+#ifdef CONFIG_MCUBOOT_IMG_MANAGER
         if (mcuboot_swap_type() == BOOT_SWAP_TYPE_REVERT)
         {
             return BootReasonType::kSoftwareUpdateCompleted;

diff --git a/src/platform/nrfconnect/BUILD.gn b/src/platform/nrfconnect/BUILD.gn
@@ -50,8 +50,6 @@ static_library("nrfconnect") {
     "InetPlatformConfig.h",
     "KeyValueStoreManagerImpl.h",
     "PlatformManagerImpl.h",
-    "Reboot.cpp",
-    "Reboot.h",
     "SystemPlatformConfig.h",
   ]
 

diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
@@ -17,8 +17,6 @@
 
 #include "OTAImageProcessorImpl.h"
 
-#include "Reboot.h"
-
 #include <app/clusters/ota-requestor/OTADownloader.h>
 #include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <lib/support/CodeUtils.h>
@@ -37,6 +35,7 @@
 #include <dfu/mcuboot.h>
 #include <logging/log.h>
 #include <pm/device.h>
+#include <sys/reboot.h>
 
 #if CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE
 // Cd globals are needed to be accessed from dfu image writer lambdas
@@ -124,7 +123,7 @@ CHIP_ERROR OTAImageProcessorImpl::Apply()
             [](System::Layer *, void * /* context */) {
                 PlatformMgr().HandleServerShuttingDown();
                 k_msleep(CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS);
-                Reboot(SoftwareRebootReason::kSoftwareUpdate);
+                sys_reboot(SYS_REBOOT_WARM);
             },
             nullptr /* context */);
     }

diff --git a/src/platform/nrfconnect/Reboot.cpp b/src/platform/nrfconnect/Reboot.cpp
diff --git a/src/platform/nrfconnect/Reboot.h b/src/platform/nrfconnect/Reboot.h