From 7cd9ec4be77169e1a7c64c8a523ee9613bcc7729 Mon Sep 17 00:00:00 2001 From: Grzegorz Swiderski Date: Wed, 23 Oct 2024 12:00:20 +0200 Subject: [PATCH 01/10] kconfig: Use SOC_NRF54H20_ENGB Certain Kconfigs were only enabled for or in relation to nRF54H20 EngC, which is the default chip revision. Ensure that the same settings are available on EngB. Signed-off-by: Grzegorz Swiderski --- applications/machine_learning/Kconfig.sysbuild | 2 +- applications/nrf_desktop/src/modules/Kconfig.dvfs | 2 +- samples/benchmarks/coremark/Kconfig | 4 ++-- .../802154_phy_test/modules/app_rpc/zephyr/Kconfig | 2 +- subsys/bluetooth/controller/Kconfig | 3 ++- subsys/esb/Kconfig | 4 ++-- subsys/sdfw_services/Kconfig | 8 ++++---- sysbuild/Kconfig.appcore | 2 +- sysbuild/Kconfig.netcore | 4 ++-- sysbuild/Kconfig.pprcore | 4 ++-- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild index e1e697dec790..29012163e19e 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -26,7 +26,7 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY config ML_APP_INCLUDE_REMOTE_IMAGE bool "Include remote image build" - depends on SOC_NRF54H20_CPUAPP + depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config ML_APP_REMOTE_BOARD string "The name of the board to be used by remote image" diff --git a/applications/nrf_desktop/src/modules/Kconfig.dvfs b/applications/nrf_desktop/src/modules/Kconfig.dvfs index e702f9ff18cf..69d725283783 100644 --- a/applications/nrf_desktop/src/modules/Kconfig.dvfs +++ b/applications/nrf_desktop/src/modules/Kconfig.dvfs @@ -6,7 +6,7 @@ menuconfig DESKTOP_DVFS bool "DVFS module" - depends on SOC_NRF54H20_CPUAPP + depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP select NRFS_DVFS_SERVICE_ENABLED select CLOCK_CONTROL select CLOCK_CONTROL_NRF2 diff --git a/samples/benchmarks/coremark/Kconfig b/samples/benchmarks/coremark/Kconfig index 0c36c65724fe..a9eb237354e4 100644 --- a/samples/benchmarks/coremark/Kconfig +++ b/samples/benchmarks/coremark/Kconfig @@ -7,8 +7,8 @@ menu "CoreMark sample" config APP_MODE_FLASH_AND_RUN - bool "Run CoreMark benchmark on start up" if !SOC_NRF54H20_CPUPPR - default y if SOC_NRF54H20_CPUPPR + bool "Run CoreMark benchmark on start up" if !(SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR) + default y if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR help If enabled, CoreMark will start execution immediately after the CPU starts up. It also disables LEDs and buttons. diff --git a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig index f8433c3031c5..284b2771c12f 100644 --- a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig +++ b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig @@ -6,6 +6,6 @@ config APP_RPC bool "Enables application module features requiring interaction between cores" - depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD + depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD select NRF_RPC select NRF_RPC_CBOR diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 642af9fb70ac..3fbcc6872b07 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -45,7 +45,7 @@ config BT_LL_SOFTDEVICE select BT_CTLR_SUBRATING_SUPPORT select BT_LL_SOFTDEVICE_HEADERS_INCLUDE depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_COMPATIBLE_NRF5340_CPUNET ||\ - SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX) + SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX) depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED help Use SoftDevice Link Layer implementation. @@ -318,6 +318,7 @@ choice BT_LL_SOFTDEVICE_VARIANT BT_ISO || \ SOC_COMPATIBLE_NRF5340_CPUNET || \ SOC_NRF54H20_CPURAD || \ + SOC_NRF54H20_ENGB_CPURAD || \ SOC_SERIES_NRF54LX) default BT_LL_SOFTDEVICE_CENTRAL if BT_OBSERVER default BT_LL_SOFTDEVICE_PERIPHERAL if BT_BROADCASTER diff --git a/subsys/esb/Kconfig b/subsys/esb/Kconfig index e8bc2ce24ac2..ca9f07f6c271 100644 --- a/subsys/esb/Kconfig +++ b/subsys/esb/Kconfig @@ -150,7 +150,7 @@ config ESB_NEVER_DISABLE_TX config ESB_FAST_SWITCHING select EXPERIMENTAL - depends on !ESB_NEVER_DISABLE_TX && SOC_NRF54H20_CPURAD + depends on !ESB_NEVER_DISABLE_TX && (SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD) bool "Fast radio TX/RX and RX/TX switching [EXPERIMENTAL]" help This option enables fast switching between transmit (TX) and receive (RX) modes @@ -164,7 +164,7 @@ config ESB_FAST_SWITCHING config ESB_FAST_CHANNEL_SWITCHING select EXPERIMENTAL - depends on SOC_NRF54H20_CPURAD + depends on SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD bool "Fast radio channel switching [EXPERIMENTAL]" help This option enables fast radio channel switching. diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig index 8247209ddec8..c9164afd3031 100644 --- a/subsys/sdfw_services/Kconfig +++ b/subsys/sdfw_services/Kconfig @@ -24,14 +24,14 @@ menu "SDFW Service Framework" config SSF_CLIENT_DOMAIN_ID int - default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default 3 if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP + default 3 if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD default 0 config SSF_CLIENT_NRF_RPC_GROUP_NAME string - default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP + default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD default "" config SSF_CLIENT_SYS_INIT diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index a59ffeda2bd1..dc3bbd1d63bc 100644 --- a/sysbuild/Kconfig.appcore +++ b/sysbuild/Kconfig.appcore @@ -4,7 +4,7 @@ config SUPPORT_APPCORE bool - default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD) + default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD) config APPCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index 65c10bf27b7b..de0e8c27495b 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -10,12 +10,12 @@ config EXTERNAL_CONFIGURED_NETCORE config SUPPORT_NETCORE bool - default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP) + default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP) config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string default "cpunet" if SOC_NRF5340_CPUAPP - default "cpurad" if SOC_NRF54H20_CPUAPP + default "cpurad" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config NETCORE_REMOTE_DOMAIN string diff --git a/sysbuild/Kconfig.pprcore b/sysbuild/Kconfig.pprcore index a3f6e2e73a14..69eac4c04b51 100644 --- a/sysbuild/Kconfig.pprcore +++ b/sysbuild/Kconfig.pprcore @@ -4,8 +4,8 @@ config SUPPORT_PPRCORE bool - default y if SOC_NRF54H20_CPUAPP + default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config PPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string - default "cpuppr" if SOC_NRF54H20_CPUAPP + default "cpuppr" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP From 4c366a498b12b4b3385d942be96ac4ce428a5986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Tue, 22 Oct 2024 10:16:57 +0200 Subject: [PATCH 02/10] manifest: pull in dependencies for binary bundle for 2.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pull in updates to several repositories to support the SDSC bundle for NCS 2.8.0 and fix build issues with nrf54h20dk@0.8.0. Signed-off-by: Håkon Amundsen Signed-off-by: Jonathan Nilsen --- west.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/west.yml b/west.yml index 287eac852998..081deb513619 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 2cac88cbaff341bbbd3a1cb8296749a7ec2e52ee + revision: pull/2153/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -149,7 +149,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: c471e4ed6dbf068630a4fd187336ba06668cde72 + revision: pull/1528/head - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m @@ -246,7 +246,7 @@ manifest: upstream-sha: c6eaeda5a1c1c5dbb24dce7e027340cb8893a77b compare-by-default: false - name: suit-generator - revision: 6d31d4f4c761b8fb7c6dc5c8a3c09bd354943957 + revision: c2e394f319823125a78ea2b0281b27cc7b3acbcf path: modules/lib/suit-generator - name: suit-processor revision: 7d94614168540359651391e64aa4de6515e43fca From 0e0e1f5bec841974a449572ee694dc12ad93a8ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Thu, 17 Oct 2024 11:46:41 +0200 Subject: [PATCH 03/10] scripts: bump nrf-regtool to 7.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for new UICR layout. Signed-off-by: Håkon Amundsen --- scripts/requirements-build.txt | 2 +- scripts/requirements-fixed.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index b109a31f6d4c..8c25df73155a 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -7,6 +7,6 @@ imagesize>=1.2.0 intelhex pylint zcbor~=0.8.0 -nrf-regtool~=6.0.0 +nrf-regtool~=7.0.0 windows-curses; sys_platform == 'win32' unidiff diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index db23d9c9efda..270f6532615c 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -97,7 +97,7 @@ mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "4.0" mypy==1.13.0 ; python_version >= "3.10" and python_version < "4.0" natsort==8.4.0 ; python_version >= "3.10" and python_version < "4.0" normality==2.5.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" -nrf-regtool==6.0.0 ; python_version >= "3.10" and python_version < "4.0" +nrf-regtool==7.0.0 ; python_version >= "3.10" and python_version < "4.0" nrfcredstore==1.0.0 ; python_version >= "3.10" and python_version < "4.0" numpy==1.26.4 ; python_version >= "3.10" and python_version < "4.0" packageurl-python==0.16.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" From 4cd24ecb300d39dceee97e4b46ab755514c06c47 Mon Sep 17 00:00:00 2001 From: Jonathan Nilsen Date: Wed, 23 Oct 2024 16:47:31 +0200 Subject: [PATCH 04/10] samples: smp_transfer: don't reserve app/radio shared memory from app Don't configure access to cpuapp/cpurad shared memory from the cpuapp side, as the shared access is configured by the cpurad side. Signed-off-by: Jonathan Nilsen --- .../boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi index 1ba8ae582379..b8165ea3181b 100644 --- a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi +++ b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi @@ -35,10 +35,6 @@ ipc0: &cpuapp_cpurad_ipc { status = "okay"; }; -&cpuapp_cpurad_ram0x_region { - status = "okay"; -}; - &cpurad_bellboard { status = "okay"; }; From 4a7a6f33a72d301ee86a628d435f39e43c716e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Fri, 18 Oct 2024 11:28:38 +0200 Subject: [PATCH 05/10] crypto: Enable NRF_SECURITY by default for nRF54H CPUAPP/CPURAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Enable this by default to get access to random numbers Signed-off-by: Frank Audun Kvamtrø --- subsys/nrf_security/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig index 10e16756ca4e..ade22f8f6a71 100644 --- a/subsys/nrf_security/Kconfig +++ b/subsys/nrf_security/Kconfig @@ -36,6 +36,7 @@ config NRF_SECURITY default y if BUILD_WITH_TFM # entropy is provided by PSA and NRF_SECURITY on NRF54LX default y if ENTROPY_PSA_CRYPTO_RNG && SOC_SERIES_NRF54LX + default y if (SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD) && ENTROPY_GENERATOR select DISABLE_MBEDTLS_BUILTIN if MBEDTLS # NCS does not use TF-M's BL2 bootloader, but uses it's own fork # of MCUBoot instead (CONFIG_BOOTLOADER_MCUBOOT). From c397c761b10ad9775a146c7695f76e6bf6d0bd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Tue, 22 Oct 2024 10:12:37 +0200 Subject: [PATCH 06/10] manifest: zephyr Add RNG to SSF enabled clients MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -This adds support for RNG from SSF in client form Signed-off-by: Frank Audun Kvamtrø --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 081deb513619..1b68e2bd74f0 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2153/head + revision: pull/2161/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 0c86d3018e22c3942549e524cc6036c85022273c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Thu, 10 Oct 2024 14:14:11 +0200 Subject: [PATCH 07/10] crypto: Fixing legacy support for nRF54H20 app and radio core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Moving including of platform.c and platform_util.c away from Oberon PSA core build (as it is needed for nRF54H20 app and radio core which will use a "core-less" PSA crypto implementation, relying solely on the SSF exposed PSA crypto support -Auto-enable of OBERON_BACKEND for PSA_SSF_CRYPTO_CLIENT to ensure that Oberon SW library is enabled for legacy Mbed TLS support. Note: This is only used when MBEDTLS_LEGACY_CRYPTO_C is enabled in the system. -Ensuring that MBEDTLS_PSA_CRYPTO_C can still be used to enable PSA crypto API support for nRF54H20 devices by also checking for CONFIG_PSA_CORE_DISABLED when deciding if PSA core should be built -Disabling cipher-checks for drivers when CONFIG_PSA_CORE_DISABLED is set in psa_crypto_config.h.template. The reason for this is to that nRF54H20 app/radio core doesn't know about driver support Signed-off-by: Frank Audun Kvamtrø --- subsys/nrf_security/CMakeLists.txt | 13 ++++++------- subsys/nrf_security/Kconfig.legacy | 1 + .../configs/psa_crypto_config.h.template | 2 ++ subsys/nrf_security/src/CMakeLists.txt | 16 ++++++---------- .../src/core/nrf_oberon/CMakeLists.txt | 6 ------ 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/subsys/nrf_security/CMakeLists.txt b/subsys/nrf_security/CMakeLists.txt index 07aaa82639a5..7eed26c1b646 100644 --- a/subsys/nrf_security/CMakeLists.txt +++ b/subsys/nrf_security/CMakeLists.txt @@ -43,11 +43,6 @@ if(CONFIG_BUILD_WITH_TFM OR CONFIG_PSA_SSF_CRYPTO_CLIENT) # We enable either TF-M or the SSF client PSA crypto interface but we are # not in the secure image build - # Add replacement platform.c for NS build - list(APPEND src_zephyr - ${ARM_MBEDTLS_PATH}/library/platform.c - ) - # The current version of the mbed TLS deliverables requires mbedcrypto built # and linked in the NS image (e.g. for mbedtls and mbedx509 library). # If CC3XX_BACKEND is enabled, configurations need to be converted to @@ -55,8 +50,12 @@ if(CONFIG_BUILD_WITH_TFM OR CONFIG_PSA_SSF_CRYPTO_CLIENT) get_cmake_property(all_vars VARIABLES) - # 1. Non-secure should not build the PSA core or drivers - set(CONFIG_MBEDTLS_PSA_CRYPTO_C False) + # 1. TF-M enabled samples should not enable the PSA core or drivers + # We still need to state CONFIG_MBEDTLS_PSA_CRYPTO_C for + # nRF54H20 devices which is not the same as an NS build... + if(NOT CONFIG_PSA_SSF_CRYPTO_CLIENT) + set(CONFIG_MBEDTLS_PSA_CRYPTO_C False) + endif() # 2. Enable OBERON_BACKEND, disable CC3XX_BACKEND set(CONFIG_NRF_OBERON True) diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy index 6687e5575287..b40d3cdd286a 100644 --- a/subsys/nrf_security/Kconfig.legacy +++ b/subsys/nrf_security/Kconfig.legacy @@ -345,6 +345,7 @@ config OBERON_BACKEND prompt "Configuration to enable nrf_oberon for legacy mbed TLS APIs" select NRF_OBERON depends on !(CC3XX_BACKEND_FORCED || CC3XX_BACKEND) + default y if PSA_SSF_CRYPTO_CLIENT help This configuration enables legacy mbed TLS APIs using nrf_oberon. PSA_CRYPTO_DRIVER_OBERON should be used instead and will replace this once diff --git a/subsys/nrf_security/configs/psa_crypto_config.h.template b/subsys/nrf_security/configs/psa_crypto_config.h.template index 91866f9958dc..f1f567b96bc3 100644 --- a/subsys/nrf_security/configs/psa_crypto_config.h.template +++ b/subsys/nrf_security/configs/psa_crypto_config.h.template @@ -446,8 +446,10 @@ #cmakedefine MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG #cmakedefine MBEDTLS_PSA_KEY_SLOT_COUNT @MBEDTLS_PSA_KEY_SLOT_COUNT@ +#if !defined(CONFIG_PSA_CORE_DISABLED) #include #include +#endif /* !CONFIG_PSA_CORE_DISABLED */ #endif /* PSA_CRYPTO_USER_CONFIG_H */ diff --git a/subsys/nrf_security/src/CMakeLists.txt b/subsys/nrf_security/src/CMakeLists.txt index e73c88502ad0..9b3775e7a032 100644 --- a/subsys/nrf_security/src/CMakeLists.txt +++ b/subsys/nrf_security/src/CMakeLists.txt @@ -119,15 +119,11 @@ append_with_prefix(src_crypto_base ${ARM_MBEDTLS_PATH}/library constant_time.c ) -# Legacy APIs were missing files added by Oberon PSA core (not built in -# certain instances. This adds the same platform support as the Oberon PSA core) -if(NOT CONFIG_MBEDTLS_PSA_CRYPTO_C) - append_with_prefix(src_crypto_base ${OBERON_PSA_CORE_PATH}/library/ - platform.c - platform_util.c - ) -endif() - +# Add platform files both with and without PSA core enabled +append_with_prefix(src_crypto_base ${OBERON_PSA_CORE_PATH}/library/ + platform.c + platform_util.c +) # Add threading support for PSA core (if enabled) include(${CMAKE_CURRENT_LIST_DIR}/threading/threading.cmake) @@ -195,7 +191,7 @@ target_compile_options(${mbedcrypto_target} ) # Add PSA core -if(CONFIG_MBEDTLS_PSA_CRYPTO_C) +if(CONFIG_MBEDTLS_PSA_CRYPTO_C AND NOT CONFIG_PSA_CORE_DISABLED) add_subdirectory(core) endif() diff --git a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt index 50702f72589d..4c576d0b10e1 100644 --- a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt +++ b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt @@ -4,11 +4,6 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -append_with_prefix(src_crypto_core_oberon ${OBERON_PSA_CORE_PATH}/library/ - platform.c - platform_util.c -) - append_with_prefix(src_crypto_core_oberon ${OBERON_PSA_CORE_PATH}/library/ psa_crypto.c psa_crypto_client.c @@ -53,4 +48,3 @@ target_link_libraries(${mbedcrypto_target} PRIVATE oberon_psa_core ) - From 32915f749de2f6ed05ea6dcf263aef50e3096a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Thu, 10 Oct 2024 14:17:23 +0200 Subject: [PATCH 08/10] wifi: crypto: Adding board files for all wifi samples for nRF54H20 devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -This commit makes wifi samples use PSA crypto exposed through SSF from SecDomain -Adding code-owner entries for samples/wifi/thread_coex -Adding code-owner entries for samples/wifi/wfa_qt_app Signed-off-by: Frank Audun Kvamtrø --- CODEOWNERS | 2 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 15 +++++++++++++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 21 +++++++++++++++++++ 33 files changed, 578 insertions(+) create mode 100644 samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay create mode 100644 samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.conf create mode 100644 samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.overlay diff --git a/CODEOWNERS b/CODEOWNERS index ad0feff96b4d..b4d3fc829fce 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -514,6 +514,8 @@ /samples/wifi/softap/ @D-Triveni @krish2718 /samples/wifi/monitor/ @D-Triveni /samples/wifi/promiscuous/ @D-Triveni +/samples/wifi/thread_coex/ @D-Triveni @nrfconnect/ncs-co-networking @nrfconnect/ncs-thread +/samples/wifi/wfa_qt_app/ @krish2718 @D-Triveni /samples/zigbee/ @nrfconnect/ncs-zigbee /samples/app_event_manager/*.rst @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc diff --git a/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/ble_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/promiscuous/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/provisioning/ble/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/provisioning/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/radio_test/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/raw_tx_packet/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/thread_coex/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/throughput/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/twt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; diff --git a/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.conf new file mode 100644 index 000000000000..3779efb3416b --- /dev/null +++ b/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Disable Oberon PSA crypto drivers +CONFIG_PSA_CRYPTO_DRIVER_OBERON=n + +# Enable PSA crypto from SSF client +CONFIG_PSA_SSF_CRYPTO_CLIENT=y +CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y + +# Disable Data Cache +CONFIG_DCACHE=n diff --git a/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..1ca688cf9792 --- /dev/null +++ b/samples/wifi/wfa_qt_app/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpuapp_ram0x_region { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +&cpuapp_bellboard { + status = "okay"; +}; From be2b20ff3d01769f3f72b9834353a3c36c729b19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Tue, 22 Oct 2024 12:43:59 +0200 Subject: [PATCH 09/10] suit: Change prng dts entry for updated SSF RNG support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Previously there was a dts entry "prng", but this is changed to "psa_rng" as we are using PSA RNG driver in zephyr Signed-off-by: Frank Audun Kvamtrø --- .../flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 3a8d40954fb0..4a54562164fe 100644 --- a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -43,6 +43,6 @@ status = "disabled"; }; -&prng { +&psa_rng { status = "disabled"; }; From 6ccd918790b36c3743bd94394437b382a73111ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Tue, 22 Oct 2024 14:08:36 +0200 Subject: [PATCH 10/10] Matter: Disable section of SSF client in boards file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Trying to disable some issues in build by not setting CONFIG_PSA_SSF_CRYPTO_CLIENT and CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED in board files for matter_bridge application Signed-off-by: Frank Audun Kvamtrø --- .../matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf index fec3fbd785d6..c536971ba2b3 100644 --- a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -9,10 +9,6 @@ CONFIG_CHIP_QSPI_NOR=n CONFIG_MPU_STACK_GUARD=n -# Enable PSA crypto from SSF client -CONFIG_PSA_SSF_CRYPTO_CLIENT=y -CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y - # TODO: Enable factory data once it is available CONFIG_CHIP_FACTORY_DATA=n