From aa675015068c2941346f32ecddfa4aeb89d469e5 Mon Sep 17 00:00:00 2001
From: Iuliana Prodan <iuliana.prodan@nxp.com>
Date: Thu, 22 Jun 2023 14:47:18 +0300
Subject: [PATCH] soc: xtensa: nxp: invoke west sign only for SOF

west sign is used only for Sound Open Firmware (SOF)
sample.
So, add this only if CONFIG_SOF is enabled.
Otherwise, when compiling other samples they're not
building because of the rimage dependency.

Fixes: 5ae7bd84d3 ("soc: xtensa: nxp: invoke west sign at west build time")

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 soc/xtensa/nxp_adsp/CMakeLists.txt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/soc/xtensa/nxp_adsp/CMakeLists.txt b/soc/xtensa/nxp_adsp/CMakeLists.txt
index 2ca5d100db3fb7..cbe587a8304f23 100644
--- a/soc/xtensa/nxp_adsp/CMakeLists.txt
+++ b/soc/xtensa/nxp_adsp/CMakeLists.txt
@@ -5,16 +5,19 @@
 
 add_subdirectory(common)
 
+#  use rimage only when compiling Sound Open Firmware (SOF)
+if(CONFIG_SOF)
 #  west sign
 
 # See detailed comments in soc/xtensa/intel_adsp/common/CMakeLists.txt
-add_custom_target(zephyr.ri ALL
-  DEPENDS ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri
-)
+  add_custom_target(zephyr.ri ALL
+    DEPENDS ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri
+  )
 
-add_custom_command(
-  OUTPUT ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri
-  COMMENT "west sign --if-tool-available --tool rimage ..."
-  COMMAND  west sign --if-tool-available --tool rimage --build-dir ${CMAKE_BINARY_DIR}
-  DEPENDS ${CMAKE_BINARY_DIR}/zephyr/zephyr.elf
-)
+  add_custom_command(
+    OUTPUT ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri
+    COMMENT "west sign --if-tool-available --tool rimage ..."
+    COMMAND  west sign --if-tool-available --tool rimage --build-dir ${CMAKE_BINARY_DIR}
+    DEPENDS ${CMAKE_BINARY_DIR}/zephyr/zephyr.elf
+  )
+endif()