[nrf fromlist] drivers: nrf_wifi: Move util to nrf70 shell

Move the wifi_util to the newly created nrf70 shell as a sub-shell.

Upstream PR #: 87823

Signed-off-by: Sachin D Kulkarni <[email protected]>

Author: sachinthegreen

drivers/wifi/nrf_wifi/CMakeLists.txt

@@ -62,8 +62,11 @@ zephyr_library_sources_ifdef(CONFIG_NRF70_UTIL
   src/wifi_util.c
 )
 
+if(CONFIG_NRF70_UTIL OR CONFIG_NRF70_DEBUG_SHELL)
+  zephyr_library_sources(src/shell.c)
+endif()
+
 zephyr_library_sources_ifdef(CONFIG_NRF70_DEBUG_SHELL
-  src/shell.c
   src/debug_shell.c
 )
 

drivers/wifi/nrf_wifi/src/wifi_util.c

@@ -964,7 +964,7 @@ static int nrf_wifi_util_rpu_recovery_info(const struct shell *sh,
 #endif /* CONFIG_NRF_WIFI_RPU_RECOVERY */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(
-	nrf_wifi_util_subcmds,
+	nrf70_util,
 	SHELL_CMD_ARG(he_ltf,
 		      NULL,
 		      "0 - 1x HE LTF\n"
@@ -1069,10 +1069,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 	SHELL_SUBCMD_SET_END);
 
 
-SHELL_CMD_REGISTER(wifi_util,
-		   &nrf_wifi_util_subcmds,
-		   "nRF Wi-Fi utility shell commands",
-		   NULL);
+SHELL_SUBCMD_ADD((nrf70), util, &nrf70_util, "nRF70 utility commands\n", NULL, 0, 0);
 
 
 static int nrf_wifi_util_init(void)