boards: posix: nrf_bsim: Update paths

Updates paths for the moved nordic_nrf SoC folder

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boards/boards_legacy/posix/nrf_bsim/CMakeLists.txt

@@ -28,7 +28,7 @@ zephyr_library_sources(
 
 # Include sync_rtc from real SOC code if enabled
 zephyr_library_sources_ifdef(CONFIG_NRF53_SYNC_RTC
-  ${ZEPHYR_BASE}/soc/soc_legacy/arm/nordic_nrf/nrf53/sync_rtc.c
+  ${ZEPHYR_BASE}/soc/nordic_nrf/nrf53/sync_rtc.c
   )
 
 target_sources(native_simulator INTERFACE

boards/boards_legacy/posix/nrf_bsim/Kconfig

@@ -6,7 +6,7 @@ if SOC_SERIES_BSIM_NRFXX
 # used by Nordic SoCs, so to make the symbols defined in this file available for
 # the simulated nrf5x_bsim boards, which use the POSIX architecture, the file
 # must be read also from here.
-source "soc/common/nordic_nrf/Kconfig.peripherals"
+source "soc/nordic_nrf/common/Kconfig.peripherals"
 
 source "boards/boards_legacy/$(ARCH)/common/extra_args/Kconfig"
 
@@ -53,6 +53,6 @@ endif # BOARD_NRF5340BSIM_NRF5340_CPUNET
 if SOC_SERIES_BSIM_NRF53X
 
 # Let's reuse the RTC sync options so applications which use it can be reused as is
-source "soc/soc_legacy/arm/nordic_nrf/nrf53/Kconfig.sync_rtc"
+source "soc/nordic_nrf/nrf53/Kconfig.sync_rtc"
 
 endif # SOC_SERIES_BSIM_NRF53X

boards/boards_legacy/posix/nrf_bsim/soc/soc_nrf_common.h

@@ -8,6 +8,6 @@
 #define BOARDS_POSIX_NRF_BSIM_SOC_SOC_NRF_COMMON_H
 
 /* We reuse the real SOC's header: */
-#include "../soc/soc_legacy/arm/nordic_nrf/common/soc_nrf_common.h"
+#include "../soc/nordic_nrf/common/soc_nrf_common.h"
 
 #endif /* BOARDS_POSIX_NRF_BSIM_SOC_SOC_NRF_COMMON_H */

boards/boards_legacy/posix/nrf_bsim/soc/soc_secure.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Replacement for Nordic's nrf  soc/soc_legacy/arm/nordic_nrf/common/soc_secure.h
+ * Replacement for Nordic's nrf  soc/nordic_nrf/common/soc_secure.h
  */
 #ifndef BOARDS_POSIX_NRF52_BSIM_SOC_SECURE_H
 #define BOARDS_POSIX_NRF52_BSIM_SOC_SECURE_H

soc/CMakeLists.txt

@@ -9,8 +9,6 @@ if(_SOC_IS_IN_TREE)
 endif()
 unset(_SOC_IS_IN_TREE)
 
-add_subdirectory(common)
-
 if(HWMv1)
   if(EXISTS ${SOC_DIR}/${ARCH}/CMakeLists.txt)
     add_subdirectory(${SOC_DIR}/${ARCH} soc/${ARCH})

soc/common/CMakeLists.txt

@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory_ifdef(CONFIG_SOC_FAMILY_NRF nordic_nrf)

soc/common/nordic_nrf/CMakeLists.txt

@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_include_directories(.)

soc/nordic_nrf/CMakeLists.txt

@@ -9,29 +9,29 @@ if(CONFIG_ARM)
     validate_base_addresses.c
     validate_enabled_instances.c
     )
+endif()
 
-  if(CONFIG_SOC_HAS_TIMING_FUNCTIONS AND NOT CONFIG_BOARD_HAS_TIMING_FUNCTIONS)
+if(CONFIG_SOC_HAS_TIMING_FUNCTIONS AND NOT CONFIG_BOARD_HAS_TIMING_FUNCTIONS)
-    if(CONFIG_TIMING_FUNCTIONS)
+  if(CONFIG_TIMING_FUNCTIONS)
-      # Use nRF-specific timing calculations only if DWT is not present
+    # Use nRF-specific timing calculations only if DWT is not present
-      if(NOT CONFIG_CORTEX_M_DWT)
+    if(NOT CONFIG_CORTEX_M_DWT)
-        zephyr_library_sources(timing.c)
+      zephyr_library_sources(timing.c)
-      endif()
     endif()
   endif()
+endif()
 
-  if(CONFIG_BUILD_WITH_TFM)
+if(CONFIG_BUILD_WITH_TFM)
-    set_property(TARGET zephyr_property_target
+  set_property(TARGET zephyr_property_target
-      APPEND PROPERTY TFM_CMAKE_OPTIONS -DHAL_NORDIC_PATH=${ZEPHYR_HAL_NORDIC_MODULE_DIR}
+    APPEND PROPERTY TFM_CMAKE_OPTIONS -DHAL_NORDIC_PATH=${ZEPHYR_HAL_NORDIC_MODULE_DIR}
-      )
+    )
 
-    set_property(TARGET zephyr_property_target
+  set_property(TARGET zephyr_property_target
-      APPEND PROPERTY TFM_CMAKE_OPTIONS -DZEPHYR_BASE=${ZEPHYR_BASE}
+    APPEND PROPERTY TFM_CMAKE_OPTIONS -DZEPHYR_BASE=${ZEPHYR_BASE}
-      )
+    )
 
-    set_property(TARGET zephyr_property_target
+  set_property(TARGET zephyr_property_target
-      APPEND PROPERTY TFM_CMAKE_OPTIONS -DNRF_NS_STORAGE=${CONFIG_TFM_NRF_NS_STORAGE}
+    APPEND PROPERTY TFM_CMAKE_OPTIONS -DNRF_NS_STORAGE=${CONFIG_TFM_NRF_NS_STORAGE}
-      )
+    )
-  endif()
 endif()
 
 add_subdirectory(${SOC_SERIES})

soc/nordic_nrf/Kconfig

@@ -12,7 +12,7 @@ config SOC_FAMILY_NRF
 
 if SOC_FAMILY_NRF
 
-source "soc/common/nordic_nrf/Kconfig.peripherals"
+rsource "common/Kconfig.peripherals"
 rsource "*/Kconfig"
 
 config NRF_SOC_SECURE_SUPPORTED

soc/nordic_nrf/Kconfig.defconfig

@@ -7,8 +7,6 @@ if SOC_FAMILY_NRF
 
 rsource "*/Kconfig.defconfig"
 
-if ARM
-
 # If the kernel has timer support, enable clock control
 if SYS_CLOCK_EXISTS
 
@@ -27,7 +25,7 @@ config SYS_CLOCK_TICKS_PER_SEC
 	default 32768
 
 config ARCH_HAS_CUSTOM_BUSY_WAIT
-	default y if !QEMU_TARGET
+	default y if ARM && !QEMU_TARGET
 
 config BUILD_OUTPUT_HEX
 	default y
@@ -44,6 +42,4 @@ config GPIO
 config UART_USE_RUNTIME_CONFIGURE
 	default n
 
-endif # ARM
-
 endif # SOC_FAMILY_NRF

soc/nordic_nrf/common/CMakeLists.txt

@@ -1,16 +1,19 @@
 # Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_ARM)
+add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr)
-  zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_NRF soc_nrf_common.S)
-  zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
 
-  zephyr_include_directories(.)
+if(CONFIG_ARM AND CONFIG_SOC_FAMILY_NRF)
+  zephyr_library_sources(soc_nrf_common.S)
+endif()
+
+zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c)
+
+zephyr_include_directories(.)
 
-  if(CONFIG_TFM_PARTITION_PLATFORM)
+if(CONFIG_TFM_PARTITION_PLATFORM)
-    zephyr_library_sources(soc_secure.c)
+  zephyr_library_sources(soc_secure.c)
-    zephyr_library_include_directories(
+  zephyr_library_include_directories(
-      $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
+    $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
-    )
+  )
-  endif()
 endif()

soc/nordic_nrf/nrf54h/CMakeLists.txt

@@ -1,10 +1,9 @@
 # Copyright (c) 2024 Nordic Semiconductor
 # SPDX-License-Identifier: Apache-2.0
 
-if(CONFIG_ARM)
+if(CONFIG_SOC_NRF54H20_ENGA_CPUAPP OR CONFIG_SOC_NRF54H20_ENGA_CPURAD)
-  add_subdirectory(arm)
+  zephyr_include_directories(.)
-elseif(CONFIG_RISCV)
+  zephyr_library_sources(soc.c)
-  add_subdirectory(riscv)
 endif()
 
 # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes

soc/nordic_nrf/nrf54h/Kconfig

@@ -30,8 +30,7 @@ config SOC_NRF54H20_ENGA_CPURAD
 	select HAS_SEGGER_RTT if ZEPHYR_SEGGER_MODULE
 
 config SOC_NRF54H20_ENGA_CPUPPR
-	select RISCV
+	depends on RISCV_CORE_NORDIC_VPR
-	select RISCV_CORE_NORDIC_VPR
 
 if SOC_NRF54H20
 
@@ -39,6 +38,4 @@ config NRF_ENABLE_ICACHE
 	bool "Instruction cache (I-Cache)"
 	default y
 
-rsource "*/Kconfig"
-
 endif # SOC_NRF54H20

soc/nordic_nrf/nrf54h/Kconfig.defconfig

@@ -33,6 +33,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 
 endif # RISCV
 
-rsource "*/Kconfig.defconfig"
-
 endif # SOC_SERIES_NRF54HX

soc/nordic_nrf/nrf54h/arm/CMakeLists.txt

@@ -1,4 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-zephyr_library_sources(soc.c)
-zephyr_include_directories(.)

soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt

@@ -1,5 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(common)
-zephyr_include_directories(.)

soc/nordic_nrf/nrf54h/riscv/Kconfig

@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-rsource "common/Kconfig"

soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig

@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-rsource "common/Kconfig.defconfig"

soc/nordic_nrf/nrf54h/riscv/common/CMakeLists.txt

@@ -1,4 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr)

soc/nordic_nrf/validate_base_addresses.c

@@ -5,9 +5,10 @@
  */
 
 #include <zephyr/kernel.h>
-#include <soc.h>
 #include <zephyr/devicetree.h>
 
+#include <nrfx.h>
+
 /*
  * Account for MDK inconsistencies
  */