[nrf toup][nrfconnect] Fix OTAUtil

Fix build error in OTAUtil.cpp

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

examples/platform/nrfconnect/util/OTAUtil.cpp

@@ -24,6 +24,7 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
 #include <app/server/Server.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/nrfconnect/ExternalFlashManager.h>
 #include <platform/nrfconnect/OTAImageProcessorImpl.h>
 #include <zephyr/dfu/mcuboot.h>
 #endif
@@ -45,7 +46,7 @@ chip::DefaultOTARequestor sOTARequestor;
 OTAImageProcessorImpl & GetOTAImageProcessor()
 {
 #if CONFIG_PM_DEVICE && CONFIG_NORDIC_QSPI_NOR
-    static OTAImageProcessorImpl sOTAImageProcessor(&GetFlashHandler());
+    static OTAImageProcessorImpl sOTAImageProcessor(ExternalFlashManager.GetInstance());
 #else
     static OTAImageProcessorImpl sOTAImageProcessor;
 #endif
@@ -93,9 +94,3 @@ void OtaConfirmNewImage()
 }
 
 #endif
-
-ExternalFlashManager & GetFlashHandler()
-{
-    static ExternalFlashManager sFlashHandler;
-    return sFlashHandler;
-}

examples/platform/nrfconnect/util/include/OTAUtil.h

@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include <platform/nrfconnect/ExternalFlashManager.h>
-
 #if CONFIG_CHIP_OTA_REQUESTOR
 #include <platform/nrfconnect/OTAImageProcessorImpl.h>
 
@@ -57,11 +55,3 @@ void InitBasicOTARequestor();
 void OtaConfirmNewImage();
 
 #endif // CONFIG_CHIP_OTA_REQUESTOR
-
-/**
- * Get ExternalFlashManager static instance.
- *
- * Returned object can be used to control the QSPI external flash,
- * which can be introduced into sleep mode and woken up on demand.
- */
-chip::DeviceLayer::ExternalFlashManager & GetFlashHandler();