ssf: remove the reset_evt and echo service

These are not needed Ref: NCSDK-30980 Signed-off-by: Håkon Amundsen <[email protected]>
hakonfam · Dec 13, 2024 · 7204ba4 · 7204ba4
1 parent e28af5e
commit 7204ba4
Show file tree

Hide file tree

Showing 27 changed files with 0 additions and 1,103 deletions.
diff --git a/include/sdfw/sdfw_services/echo_service.h b/include/sdfw/sdfw_services/echo_service.h
diff --git a/include/sdfw/sdfw_services/reset_evt_service.h b/include/sdfw/sdfw_services/reset_evt_service.h
diff --git a/samples/sdfw/ssf_client/Kconfig b/samples/sdfw/ssf_client/Kconfig
@@ -11,16 +11,6 @@ menuconfig SSF_CLIENT_SAMPLE
 
 if SSF_CLIENT_SAMPLE
 
-config ENABLE_ECHO_REQUEST
-	bool "Enable SSF dummy request service(s)"
-	depends on SSF_ECHO_SERVICE_ENABLED
-	default y
-
-config ENABLE_RESET_EVT_SUBSCRIBE_REQUEST
-	bool "Enable the reset event subscription service"
-	depends on SSF_RESET_EVT_SERVICE_ENABLED
-	default y
-
 config ENABLE_SDFW_UPDATE_REQUEST
 	bool "Enable the SDFW update service"
 	depends on SSF_SDFW_UPDATE_SERVICE_ENABLED

diff --git a/samples/sdfw/ssf_client/src/main.c b/samples/sdfw/ssf_client/src/main.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <sdfw/sdfw_services/echo_service.h>
-#include <sdfw/sdfw_services/reset_evt_service.h>
 #include <sdfw/sdfw_services/sdfw_update_service.h>
 
 #include <zephyr/kernel.h>
@@ -18,40 +16,6 @@ LOG_MODULE_REGISTER(ssf_client_sample, CONFIG_SSF_CLIENT_SAMPLE_LOG_LEVEL);
 #define IMPRIMATUR_UPDATE_IMAGE_OFFSET (0xe155000)
 #endif
 
-static void echo_request(void)
-{
-	int err;
-	char req_str[] = "Hello " CONFIG_BOARD;
-	char rsp_str[sizeof(req_str) + 1];
-
-	LOG_INF("Calling ssf_echo, str: \"%s\"", req_str);
-
-	err = ssf_echo(req_str, rsp_str, sizeof(rsp_str));
-	if (err != 0) {
-		LOG_ERR("ssf_echo failed");
-	} else {
-		LOG_INF("ssf_echo response: %s", rsp_str);
-	}
-}
-
-static int reset_evt_callback(uint32_t domains, uint32_t delay_ms, void *user_data)
-{
-	LOG_INF("reset_evt: domains 0x%x will reset in %d ms", domains, delay_ms);
-
-	return 0;
-}
-
-static void reset_evt_subscribe(void)
-{
-	int err;
-
-	err = ssf_reset_evt_subscribe(reset_evt_callback, NULL);
-	if (err != 0) {
-		LOG_ERR("Unable to subscribe to reset_evt, err: %d", err);
-		return;
-	}
-}
-
 static void sdfw_update(void)
 {
 	int err;
@@ -74,14 +38,6 @@ int main(void)
 {
 	LOG_INF("ssf client sample (%s)", CONFIG_BOARD);
 
-	if (IS_ENABLED(CONFIG_ENABLE_ECHO_REQUEST)) {
-		echo_request();
-	}
-
-	if (IS_ENABLED(CONFIG_ENABLE_RESET_EVT_SUBSCRIBE_REQUEST)) {
-		reset_evt_subscribe();
-	}
-
 	if (IS_ENABLED(CONFIG_ENABLE_SDFW_UPDATE_REQUEST)) {
 		sdfw_update();
 	}

diff --git a/samples/suit/recovery/prj.conf b/samples/suit/recovery/prj.conf
@@ -113,6 +113,3 @@ CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n
 
 CONFIG_BT_CTLR_PRIVACY=n
 CONFIG_BT_CTLR_PHY_2M=n
-
-CONFIG_SSF_ECHO_SERVICE_ENABLED=n
-CONFIG_SSF_RESET_EVT_SERVICE_ENABLED=n
diff --git a/subsys/sdfw_services/services/CMakeLists.txt b/subsys/sdfw_services/services/CMakeLists.txt
@@ -5,10 +5,8 @@
 #
 
 # Services
-add_subdirectory_ifdef(CONFIG_SSF_ECHO_SERVICE_ENABLED echo)
 add_subdirectory_ifdef(CONFIG_SSF_ENC_FW_SERVICE_ENABLED enc_fw)
 add_subdirectory_ifdef(CONFIG_SSF_EXTMEM_SERVICE_ENABLED extmem)
 add_subdirectory_ifdef(CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED psa_crypto)
-add_subdirectory_ifdef(CONFIG_SSF_RESET_EVT_SERVICE_ENABLED reset_evt)
 add_subdirectory_ifdef(CONFIG_SSF_SDFW_UPDATE_SERVICE_ENABLED sdfw_update)
 add_subdirectory_ifdef(CONFIG_SSF_SUIT_SERVICE_ENABLED suit_service)
diff --git a/subsys/sdfw_services/services/Kconfig b/subsys/sdfw_services/services/Kconfig
@@ -5,10 +5,8 @@
 #
 
 # Services
-rsource "echo/Kconfig"
 rsource "enc_fw/Kconfig"
 rsource "extmem/Kconfig"
 rsource "psa_crypto/Kconfig"
-rsource "reset_evt/Kconfig"
 rsource "sdfw_update/Kconfig"
 rsource "suit_service/Kconfig"
diff --git a/subsys/sdfw_services/services/echo/CMakeLists.txt b/subsys/sdfw_services/services/echo/CMakeLists.txt
diff --git a/subsys/sdfw_services/services/echo/Kconfig b/subsys/sdfw_services/services/echo/Kconfig
diff --git a/subsys/sdfw_services/services/echo/echo_service.c b/subsys/sdfw_services/services/echo/echo_service.c
diff --git a/subsys/sdfw_services/services/echo/echo_service.cddl b/subsys/sdfw_services/services/echo/echo_service.cddl
diff --git a/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt b/subsys/sdfw_services/services/echo/zcbor_generated/CMakeLists.txt