From 91a077b2ab8609a48735f5f8a18e893871a7ab69 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 14 Feb 2024 10:59:53 +0000 Subject: [PATCH] boards: posix: nrf_bsim: Update paths Updates paths for the moved nordic_nrf SoC folder Signed-off-by: Jamie McCrae --- .../posix/nrf_bsim/CMakeLists.txt | 2 +- boards/boards_legacy/posix/nrf_bsim/Kconfig | 4 +-- .../posix/nrf_bsim/soc/soc_nrf_common.h | 2 +- .../posix/nrf_bsim/soc/soc_secure.h | 2 +- soc/CMakeLists.txt | 2 -- soc/common/CMakeLists.txt | 4 --- soc/common/nordic_nrf/CMakeLists.txt | 4 --- soc/nordic_nrf/CMakeLists.txt | 34 +++++++++---------- soc/nordic_nrf/Kconfig | 2 +- soc/nordic_nrf/Kconfig.defconfig | 6 +--- soc/nordic_nrf/common/CMakeLists.txt | 23 +++++++------ .../{nrf54h/riscv => }/common/Kconfig | 0 .../riscv => }/common/Kconfig.defconfig | 0 .../common}/Kconfig.peripherals | 0 .../common}/pinctrl_soc.h | 0 .../riscv => }/common/vpr/CMakeLists.txt | 0 .../{nrf54h/riscv => }/common/vpr/Kconfig | 0 .../riscv => }/common/vpr/Kconfig.defconfig | 0 .../riscv => }/common/vpr/soc_context.h | 0 .../{nrf54h/riscv => }/common/vpr/soc_irq.S | 0 .../{nrf54h/riscv => }/common/vpr/soc_irq.c | 0 .../riscv => }/common/vpr/soc_isr_stacking.h | 0 .../riscv => }/common/vpr/soc_offsets.h | 0 .../{nrf54h/riscv => }/common/vpr/vector.S | 0 soc/nordic_nrf/nrf54h/CMakeLists.txt | 7 ++-- soc/nordic_nrf/nrf54h/Kconfig | 5 +-- soc/nordic_nrf/nrf54h/Kconfig.defconfig | 2 -- soc/nordic_nrf/nrf54h/arm/CMakeLists.txt | 4 --- soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt | 5 --- soc/nordic_nrf/nrf54h/riscv/Kconfig | 4 --- soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig | 4 --- .../nrf54h/riscv/common/CMakeLists.txt | 4 --- soc/nordic_nrf/nrf54h/{arm => }/soc.c | 0 soc/nordic_nrf/nrf54h/{arm => }/soc.h | 0 soc/nordic_nrf/validate_base_addresses.c | 3 +- 35 files changed, 43 insertions(+), 80 deletions(-) delete mode 100644 soc/common/CMakeLists.txt delete mode 100644 soc/common/nordic_nrf/CMakeLists.txt rename soc/nordic_nrf/{nrf54h/riscv => }/common/Kconfig (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/Kconfig.defconfig (100%) rename soc/{common/nordic_nrf => nordic_nrf/common}/Kconfig.peripherals (100%) rename soc/{common/nordic_nrf => nordic_nrf/common}/pinctrl_soc.h (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/CMakeLists.txt (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/Kconfig (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/Kconfig.defconfig (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/soc_context.h (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/soc_irq.S (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/soc_irq.c (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/soc_isr_stacking.h (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/soc_offsets.h (100%) rename soc/nordic_nrf/{nrf54h/riscv => }/common/vpr/vector.S (100%) delete mode 100644 soc/nordic_nrf/nrf54h/arm/CMakeLists.txt delete mode 100644 soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt delete mode 100644 soc/nordic_nrf/nrf54h/riscv/Kconfig delete mode 100644 soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig delete mode 100644 soc/nordic_nrf/nrf54h/riscv/common/CMakeLists.txt rename soc/nordic_nrf/nrf54h/{arm => }/soc.c (100%) rename soc/nordic_nrf/nrf54h/{arm => }/soc.h (100%) diff --git a/boards/boards_legacy/posix/nrf_bsim/CMakeLists.txt b/boards/boards_legacy/posix/nrf_bsim/CMakeLists.txt index 972de5a3881..fa073d03914 100644 --- a/boards/boards_legacy/posix/nrf_bsim/CMakeLists.txt +++ b/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 diff --git a/boards/boards_legacy/posix/nrf_bsim/Kconfig b/boards/boards_legacy/posix/nrf_bsim/Kconfig index 332c1efc504..7732d7da0c0 100644 --- a/boards/boards_legacy/posix/nrf_bsim/Kconfig +++ b/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 diff --git a/boards/boards_legacy/posix/nrf_bsim/soc/soc_nrf_common.h b/boards/boards_legacy/posix/nrf_bsim/soc/soc_nrf_common.h index 6cb07847e3d..897a0e16f06 100644 --- a/boards/boards_legacy/posix/nrf_bsim/soc/soc_nrf_common.h +++ b/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 */ diff --git a/boards/boards_legacy/posix/nrf_bsim/soc/soc_secure.h b/boards/boards_legacy/posix/nrf_bsim/soc/soc_secure.h index 2ee2e689554..ae833c1a657 100644 --- a/boards/boards_legacy/posix/nrf_bsim/soc/soc_secure.h +++ b/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 diff --git a/soc/CMakeLists.txt b/soc/CMakeLists.txt index f9d754cfbb3..353179fbea5 100644 --- a/soc/CMakeLists.txt +++ b/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}) diff --git a/soc/common/CMakeLists.txt b/soc/common/CMakeLists.txt deleted file mode 100644 index d9abad218cd..00000000000 --- a/soc/common/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/soc/common/nordic_nrf/CMakeLists.txt b/soc/common/nordic_nrf/CMakeLists.txt deleted file mode 100644 index 6f397a07fab..00000000000 --- a/soc/common/nordic_nrf/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -zephyr_include_directories(.) diff --git a/soc/nordic_nrf/CMakeLists.txt b/soc/nordic_nrf/CMakeLists.txt index 593013f7f68..9e0619772e2 100644 --- a/soc/nordic_nrf/CMakeLists.txt +++ b/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_TIMING_FUNCTIONS) - # Use nRF-specific timing calculations only if DWT is not present - if(NOT CONFIG_CORTEX_M_DWT) - zephyr_library_sources(timing.c) - endif() +if(CONFIG_SOC_HAS_TIMING_FUNCTIONS AND NOT CONFIG_BOARD_HAS_TIMING_FUNCTIONS) + if(CONFIG_TIMING_FUNCTIONS) + # Use nRF-specific timing calculations only if DWT is not present + if(NOT CONFIG_CORTEX_M_DWT) + zephyr_library_sources(timing.c) endif() endif() +endif() - if(CONFIG_BUILD_WITH_TFM) - set_property(TARGET zephyr_property_target - APPEND PROPERTY TFM_CMAKE_OPTIONS -DHAL_NORDIC_PATH=${ZEPHYR_HAL_NORDIC_MODULE_DIR} - ) +if(CONFIG_BUILD_WITH_TFM) + set_property(TARGET zephyr_property_target + APPEND PROPERTY TFM_CMAKE_OPTIONS -DHAL_NORDIC_PATH=${ZEPHYR_HAL_NORDIC_MODULE_DIR} + ) - set_property(TARGET zephyr_property_target - APPEND PROPERTY TFM_CMAKE_OPTIONS -DZEPHYR_BASE=${ZEPHYR_BASE} - ) + set_property(TARGET zephyr_property_target + APPEND PROPERTY TFM_CMAKE_OPTIONS -DZEPHYR_BASE=${ZEPHYR_BASE} + ) - set_property(TARGET zephyr_property_target - APPEND PROPERTY TFM_CMAKE_OPTIONS -DNRF_NS_STORAGE=${CONFIG_TFM_NRF_NS_STORAGE} - ) - endif() + set_property(TARGET zephyr_property_target + APPEND PROPERTY TFM_CMAKE_OPTIONS -DNRF_NS_STORAGE=${CONFIG_TFM_NRF_NS_STORAGE} + ) endif() add_subdirectory(${SOC_SERIES}) diff --git a/soc/nordic_nrf/Kconfig b/soc/nordic_nrf/Kconfig index 1aefb605901..98fd5ac3b0b 100644 --- a/soc/nordic_nrf/Kconfig +++ b/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 diff --git a/soc/nordic_nrf/Kconfig.defconfig b/soc/nordic_nrf/Kconfig.defconfig index 1bf6f73f160..1ed3b4a45ec 100644 --- a/soc/nordic_nrf/Kconfig.defconfig +++ b/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 diff --git a/soc/nordic_nrf/common/CMakeLists.txt b/soc/nordic_nrf/common/CMakeLists.txt index 615b95fcf64..ed1f5340efc 100644 --- a/soc/nordic_nrf/common/CMakeLists.txt +++ b/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) - zephyr_library_sources_ifdef(CONFIG_SOC_FAMILY_NRF soc_nrf_common.S) - zephyr_library_sources_ifdef(CONFIG_POWEROFF poweroff.c) +add_subdirectory_ifdef(CONFIG_RISCV_CORE_NORDIC_VPR vpr) - 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) - zephyr_library_sources(soc_secure.c) - zephyr_library_include_directories( - $/api_ns/interface/include - ) - endif() +if(CONFIG_TFM_PARTITION_PLATFORM) + zephyr_library_sources(soc_secure.c) + zephyr_library_include_directories( + $/api_ns/interface/include + ) endif() diff --git a/soc/nordic_nrf/nrf54h/riscv/common/Kconfig b/soc/nordic_nrf/common/Kconfig similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/Kconfig rename to soc/nordic_nrf/common/Kconfig diff --git a/soc/nordic_nrf/nrf54h/riscv/common/Kconfig.defconfig b/soc/nordic_nrf/common/Kconfig.defconfig similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/Kconfig.defconfig rename to soc/nordic_nrf/common/Kconfig.defconfig diff --git a/soc/common/nordic_nrf/Kconfig.peripherals b/soc/nordic_nrf/common/Kconfig.peripherals similarity index 100% rename from soc/common/nordic_nrf/Kconfig.peripherals rename to soc/nordic_nrf/common/Kconfig.peripherals diff --git a/soc/common/nordic_nrf/pinctrl_soc.h b/soc/nordic_nrf/common/pinctrl_soc.h similarity index 100% rename from soc/common/nordic_nrf/pinctrl_soc.h rename to soc/nordic_nrf/common/pinctrl_soc.h diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/CMakeLists.txt b/soc/nordic_nrf/common/vpr/CMakeLists.txt similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/CMakeLists.txt rename to soc/nordic_nrf/common/vpr/CMakeLists.txt diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/Kconfig b/soc/nordic_nrf/common/vpr/Kconfig similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/Kconfig rename to soc/nordic_nrf/common/vpr/Kconfig diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/Kconfig.defconfig b/soc/nordic_nrf/common/vpr/Kconfig.defconfig similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/Kconfig.defconfig rename to soc/nordic_nrf/common/vpr/Kconfig.defconfig diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_context.h b/soc/nordic_nrf/common/vpr/soc_context.h similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_context.h rename to soc/nordic_nrf/common/vpr/soc_context.h diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_irq.S b/soc/nordic_nrf/common/vpr/soc_irq.S similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_irq.S rename to soc/nordic_nrf/common/vpr/soc_irq.S diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_irq.c b/soc/nordic_nrf/common/vpr/soc_irq.c similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_irq.c rename to soc/nordic_nrf/common/vpr/soc_irq.c diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_isr_stacking.h b/soc/nordic_nrf/common/vpr/soc_isr_stacking.h similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_isr_stacking.h rename to soc/nordic_nrf/common/vpr/soc_isr_stacking.h diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_offsets.h b/soc/nordic_nrf/common/vpr/soc_offsets.h similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/soc_offsets.h rename to soc/nordic_nrf/common/vpr/soc_offsets.h diff --git a/soc/nordic_nrf/nrf54h/riscv/common/vpr/vector.S b/soc/nordic_nrf/common/vpr/vector.S similarity index 100% rename from soc/nordic_nrf/nrf54h/riscv/common/vpr/vector.S rename to soc/nordic_nrf/common/vpr/vector.S diff --git a/soc/nordic_nrf/nrf54h/CMakeLists.txt b/soc/nordic_nrf/nrf54h/CMakeLists.txt index 3bdc4ea3004..67a6dab6f8a 100644 --- a/soc/nordic_nrf/nrf54h/CMakeLists.txt +++ b/soc/nordic_nrf/nrf54h/CMakeLists.txt @@ -1,10 +1,9 @@ # Copyright (c) 2024 Nordic Semiconductor # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_ARM) - add_subdirectory(arm) -elseif(CONFIG_RISCV) - add_subdirectory(riscv) +if(CONFIG_SOC_NRF54H20_ENGA_CPUAPP OR CONFIG_SOC_NRF54H20_ENGA_CPURAD) + zephyr_include_directories(.) + zephyr_library_sources(soc.c) endif() # Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes diff --git a/soc/nordic_nrf/nrf54h/Kconfig b/soc/nordic_nrf/nrf54h/Kconfig index caad291bafa..d9d5b0789f9 100644 --- a/soc/nordic_nrf/nrf54h/Kconfig +++ b/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 - select RISCV_CORE_NORDIC_VPR + depends on 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 diff --git a/soc/nordic_nrf/nrf54h/Kconfig.defconfig b/soc/nordic_nrf/nrf54h/Kconfig.defconfig index c10134a456d..72ba234e883 100644 --- a/soc/nordic_nrf/nrf54h/Kconfig.defconfig +++ b/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 diff --git a/soc/nordic_nrf/nrf54h/arm/CMakeLists.txt b/soc/nordic_nrf/nrf54h/arm/CMakeLists.txt deleted file mode 100644 index 53398751982..00000000000 --- a/soc/nordic_nrf/nrf54h/arm/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -zephyr_library_sources(soc.c) -zephyr_include_directories(.) diff --git a/soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt b/soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt deleted file mode 100644 index 9cc14cbc8b8..00000000000 --- a/soc/nordic_nrf/nrf54h/riscv/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor -# SPDX-License-Identifier: Apache-2.0 - -add_subdirectory(common) -zephyr_include_directories(.) diff --git a/soc/nordic_nrf/nrf54h/riscv/Kconfig b/soc/nordic_nrf/nrf54h/riscv/Kconfig deleted file mode 100644 index 26b8ef47f3d..00000000000 --- a/soc/nordic_nrf/nrf54h/riscv/Kconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -rsource "common/Kconfig" diff --git a/soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig b/soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig deleted file mode 100644 index e166411124c..00000000000 --- a/soc/nordic_nrf/nrf54h/riscv/Kconfig.defconfig +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -rsource "common/Kconfig.defconfig" diff --git a/soc/nordic_nrf/nrf54h/riscv/common/CMakeLists.txt b/soc/nordic_nrf/nrf54h/riscv/common/CMakeLists.txt deleted file mode 100644 index 806a295ea22..00000000000 --- a/soc/nordic_nrf/nrf54h/riscv/common/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/soc/nordic_nrf/nrf54h/arm/soc.c b/soc/nordic_nrf/nrf54h/soc.c similarity index 100% rename from soc/nordic_nrf/nrf54h/arm/soc.c rename to soc/nordic_nrf/nrf54h/soc.c diff --git a/soc/nordic_nrf/nrf54h/arm/soc.h b/soc/nordic_nrf/nrf54h/soc.h similarity index 100% rename from soc/nordic_nrf/nrf54h/arm/soc.h rename to soc/nordic_nrf/nrf54h/soc.h diff --git a/soc/nordic_nrf/validate_base_addresses.c b/soc/nordic_nrf/validate_base_addresses.c index 28ec231b132..79083d630dd 100644 --- a/soc/nordic_nrf/validate_base_addresses.c +++ b/soc/nordic_nrf/validate_base_addresses.c @@ -5,9 +5,10 @@ */ #include -#include #include +#include + /* * Account for MDK inconsistencies */