[nrf fromlist] soc: nordic: align paths to BSP

Align paths after introducing BSP.

Upstream PR #: 96160

Signed-off-by: Magdalena Pastula <[email protected]>

Author: magp-nordic

soc/nordic/CMakeLists.txt

@@ -45,6 +45,9 @@ if(CONFIG_BUILD_WITH_TFM)
     )
 endif()
 
-add_subdirectory(${SOC_SERIES})
+if(CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
+  add_subdirectory(${SOC_SERIES})
+endif()
+
 add_subdirectory(common)
 add_subdirectory_ifdef(CONFIG_NRF_IRONSIDE ironside)

soc/nordic/Kconfig

@@ -50,6 +50,10 @@ config SOC_FAMILY_NORDIC_NRF
 
 if SOC_FAMILY_NORDIC_NRF
 
+config SOC_NORDIC_BSP_NAME
+	string
+	default "stable"
+
 rsource "common/Kconfig.peripherals"
 rsource "*/Kconfig"
 

soc/nordic/nrf54h/bicr/CMakeLists.txt

@@ -1,7 +1,7 @@
 if(CONFIG_SOC_NRF54H20_GENERATE_BICR)
   set(bicr_json_file ${BOARD_DIR}/bicr.json)
   set(bicr_hex_file ${PROJECT_BINARY_DIR}/bicr.hex)
-  set(svd_file ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk/nrf54h20_application.svd)
+  set(svd_file ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/bsp/stable/mdk/nrf54h20_application.svd)
 
   if(EXISTS ${bicr_json_file})
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${bicr_json_file})