diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig index 61b20723ab4..a2be74d3648 100644 --- a/boards/nordic/nrf54h20dk/Kconfig.defconfig +++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig @@ -6,9 +6,6 @@ if BOARD_NRF54H20DK_NRF54H20_CPUAPP config BT_HCI_IPC default y if BT -config MAX_THREAD_BYTES - default 3 if USERSPACE - endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPURAD @@ -16,9 +13,6 @@ if BOARD_NRF54H20DK_NRF54H20_CPURAD config BT_CTLR default y if BT -config MAX_THREAD_BYTES - default 3 if USERSPACE - endif # BOARD_NRF54H20DK_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPUPPR diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi index 165fa12ba80..f2937402554 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi @@ -7,44 +7,44 @@ / { reserved-memory { - cpurad_ram0x_region: memory@2f010000 { + cpuapp_ram0x_region: memory@2f010000 { compatible = "nordic,owned-memory"; - reg = <0x2f010000 DT_SIZE_K(4)>; + reg = <0x2f010000 DT_SIZE_K(260)>; status = "disabled"; - nordic,access = ; + nordic,access = ; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x2f010000 0x1000>; + ranges = <0x0 0x2f010000 0x41000>; - cpusec_cpurad_ipc_shm: memory@0 { + cpusec_cpuapp_ipc_shm: memory@0 { reg = <0x0 DT_SIZE_K(2)>; }; - cpurad_cpusec_ipc_shm: memory@800 { + cpuapp_cpusec_ipc_shm: memory@800 { reg = <0x800 DT_SIZE_K(2)>; }; + + cpuapp_data: memory@1000 { + reg = <0x1000 DT_SIZE_K(256)>; + }; }; - cpuapp_ram0x_region: memory@2f011000 { + cpurad_ram0x_region: memory@2f051000 { compatible = "nordic,owned-memory"; - reg = <0x2f011000 DT_SIZE_K(260)>; + reg = <0x2f051000 DT_SIZE_K(4)>; status = "disabled"; - nordic,access = ; + nordic,access = ; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x2f011000 0x41000>; + ranges = <0x0 0x2f051000 0x1000>; - cpusec_cpuapp_ipc_shm: memory@0 { + cpusec_cpurad_ipc_shm: memory@0 { reg = <0x0 DT_SIZE_K(2)>; }; - cpuapp_cpusec_ipc_shm: memory@800 { + cpurad_cpusec_ipc_shm: memory@800 { reg = <0x800 DT_SIZE_K(2)>; }; - - cpuapp_data: memory@1000 { - reg = <0x1000 DT_SIZE_K(256)>; - }; }; etr_buf_ram0x_region: memory@2f0be000 { diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts index 920907f3c69..171732d81e6 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts @@ -27,7 +27,7 @@ zephyr,bt-hci = &bt_hci_ipc0; nordic,802154-spinel-ipc = &ipc0; zephyr,canbus = &can120; - zephyr,entropy = &psa_rng; + zephyr,entropy = &prng; }; aliases { @@ -109,8 +109,8 @@ }; }; - psa_rng: psa-rng { - compatible = "zephyr,psa-crypto-rng"; + prng: prng { + compatible = "nordic,entropy-prng"; status = "okay"; }; }; @@ -150,16 +150,11 @@ }; &cpusec_cpuapp_ipc { - status = "okay"; mbox-names = "tx", "rx"; tx-region = <&cpuapp_cpusec_ipc_shm>; rx-region = <&cpusec_cpuapp_ipc_shm>; }; -&cpusec_bellboard { - status = "okay"; -}; - ipc0: &cpuapp_cpurad_ipc { status = "okay"; mbox-names = "rx", "tx"; diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts index f57b00fceda..049617e6dc6 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts @@ -27,27 +27,22 @@ zephyr,ieee802154 = &cpurad_ieee802154; zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; - zephyr,entropy = &psa_rng; + zephyr,entropy = &prng; + }; + prng: prng { + compatible = "nordic,entropy-prng"; + status = "okay"; }; aliases { ipc-to-cpusys = &cpurad_cpusys_ipc; resetinfo = &cpurad_resetinfo; }; - - psa_rng: psa-rng { - compatible = "zephyr,psa-crypto-rng"; - status = "okay"; - }; }; &cpuapp_cpurad_ram0x_region { status = "okay"; }; -&cpurad_ram0x_region { - status = "okay"; -}; - &cpurad_bellboard { status = "okay"; interrupts = <96 NRF_DEFAULT_IRQ_PRIORITY>; @@ -65,16 +60,11 @@ }; &cpusec_cpurad_ipc { - status = "okay"; mbox-names = "tx", "rx"; tx-region = <&cpurad_cpusec_ipc_shm>; rx-region = <&cpusec_cpurad_ipc_shm>; }; -&cpusec_bellboard { - status = "okay"; -}; - ipc0: &cpuapp_cpurad_ipc { status = "okay"; mbox-names = "tx", "rx"; diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto index 8a8cca6c56f..18514a071d1 100644 --- a/drivers/entropy/Kconfig.psa_crypto +++ b/drivers/entropy/Kconfig.psa_crypto @@ -8,7 +8,6 @@ config ENTROPY_PSA_CRYPTO_RNG depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED select ENTROPY_HAS_DRIVER select PSA_WANT_GENERATE_RANDOM - select SSF_PSA_CRYPTO_SERVICE_ENABLED if (SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR) default y help Enable the PSA Crypto source Entropy driver. diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig index dcbd980b64b..d54ef99da8e 100644 --- a/soc/nordic/nrf54h/Kconfig +++ b/soc/nordic/nrf54h/Kconfig @@ -16,7 +16,7 @@ config SOC_NRF54H20_CPUAPP_COMMON select CPU_CORTEX_M33 select CPU_HAS_ARM_MPU select CPU_HAS_ARM_SAU - select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED + select CPU_HAS_DCACHE select CPU_HAS_ICACHE select CPU_HAS_FPU select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS @@ -43,7 +43,7 @@ config SOC_NRF54H20_CPURAD_COMMON select CPU_CORTEX_M33 select CPU_HAS_ARM_MPU select CPU_HAS_ARM_SAU - select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED + select CPU_HAS_DCACHE select CPU_HAS_ICACHE select CPU_HAS_FPU select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index d1566b5aa63..00000000000 --- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&cpusec_cpuapp_ipc { - status = "disabled"; -}; - -&cpusec_bellboard{ - status = "disabled"; -}; diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay deleted file mode 100644 index 04c22168b6c..00000000000 --- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&cpusec_cpurad_ipc { - status = "disabled"; -}; - -&cpusec_bellboard{ - status = "disabled"; -}; diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay deleted file mode 100644 index d1566b5aa63..00000000000 --- a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&cpusec_cpuapp_ipc { - status = "disabled"; -}; - -&cpusec_bellboard{ - status = "disabled"; -}; diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay deleted file mode 100644 index 04c22168b6c..00000000000 --- a/tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor - * - * SPDX-License-Identifier: Apache-2.0 - */ - -&cpusec_cpurad_ipc { - status = "disabled"; -}; - -&cpusec_bellboard{ - status = "disabled"; -}; diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay deleted file mode 100644 index f9615d1b35e..00000000000 --- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -&cpusec_cpuapp_ipc { - status = "disabled"; -}; - -&cpusec_bellboard { - status = "disabled"; -}; diff --git a/tests/crypto/mbedtls/testcase.yaml b/tests/crypto/mbedtls/testcase.yaml index 8c4c49c2934..9b89364da93 100644 --- a/tests/crypto/mbedtls/testcase.yaml +++ b/tests/crypto/mbedtls/testcase.yaml @@ -8,10 +8,7 @@ common: timeout: 400 tests: crypto.mbedtls: - platform_exclude: - - m2gl025_miv - - nrf54h20dk/nrf54h20/cpuapp - - nrf54h20dk/nrf54h20/cpurad + platform_exclude: m2gl025_miv extra_configs: - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0 - arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192 diff --git a/tests/crypto/mbedtls_psa/testcase.yaml b/tests/crypto/mbedtls_psa/testcase.yaml index 55b2386b163..6b96e8ff5f6 100644 --- a/tests/crypto/mbedtls_psa/testcase.yaml +++ b/tests/crypto/mbedtls_psa/testcase.yaml @@ -17,8 +17,7 @@ # latter case will allow to test # CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG. common: - filter: not CONFIG_BUILD_WITH_TFM and - not CONFIG_PSA_SSF_CRYPTO_CLIENT + filter: not CONFIG_BUILD_WITH_TFM tags: - mbedtls - psa diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml index 0063ccbbffd..0e21e0d86b5 100644 --- a/tests/crypto/secp256r1/testcase.yaml +++ b/tests/crypto/secp256r1/testcase.yaml @@ -3,9 +3,7 @@ common: CONFIG_CSPRNG_ENABLED and CONFIG_HARDWARE_DEVICE_CS_GENERATOR and not CONFIG_BUILD_WITH_TFM and - not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT) and - not CONFIG_PSA_SSF_CRYPTO_CLIENT - + not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT) tags: - mbedtls - tinycrypt diff --git a/tests/net/socket/tls_configurations/overlay-ec.conf b/tests/net/socket/tls_configurations/overlay-ec.conf index c109147eb8e..b53dc4bcb55 100644 --- a/tests/net/socket/tls_configurations/overlay-ec.conf +++ b/tests/net/socket/tls_configurations/overlay-ec.conf @@ -1,7 +1,5 @@ CONFIG_PSA_WANT_ALG_ECDH=y CONFIG_PSA_WANT_ALG_ECDSA=y +CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC=y CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT=y -CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y CONFIG_PSA_WANT_ECC_SECP_R1_256=y diff --git a/tests/subsys/portability/cmsis_rtos_v2/prj.conf b/tests/subsys/portability/cmsis_rtos_v2/prj.conf index d8e93b74785..282d8c4ebcd 100644 --- a/tests/subsys/portability/cmsis_rtos_v2/prj.conf +++ b/tests/subsys/portability/cmsis_rtos_v2/prj.conf @@ -13,6 +13,7 @@ CONFIG_SCHED_SCALABLE=y CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE=128 CONFIG_CMSIS_V2_THREAD_MAX_COUNT=23 CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT=10 +CONFIG_TIMEOUT_64BIT=n CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE=1024 CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE=1024 CONFIG_MP_MAX_NUM_CPUS=1