From 34d9868b93626c4ed266e96f21969b308ab35bea Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:47:38 +0100 Subject: [PATCH 01/12] Revert "[nrf fromlist] tests: arm_irq_vector_table: Disable bellboard for nRF54/nRF92" This reverts commit 47e589250c0f9128aa11f0c3d0a5f7e0d83fc2ba. Signed-off-by: Georgios Vasilakis --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 13 ------------- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 13 ------------- .../boards/nrf9280pdk_nrf9280_cpuapp.overlay | 13 ------------- .../boards/nrf9280pdk_nrf9280_cpurad.overlay | 13 ------------- 4 files changed, 52 deletions(-) delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpuapp.overlay delete mode 100644 tests/arch/arm/arm_irq_vector_table/boards/nrf9280pdk_nrf9280_cpurad.overlay 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"; -}; From a8974cc28597483a14ad64d3193bf7f48b08cd94 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:06 +0100 Subject: [PATCH 02/12] Revert "[nrf noup] tests: Disable mbedtls legacy for 54H20" This reverts commit 8e808e3fc23e96ae24c229f287262aafefe6cc4b. Signed-off-by: Georgios Vasilakis --- tests/crypto/mbedtls/testcase.yaml | 5 +---- tests/crypto/mbedtls_psa/testcase.yaml | 3 +-- tests/crypto/secp256r1/testcase.yaml | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) 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 From 2e9382336958a8fbbfd6b232f8f3ce081fd24c0f Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:08 +0100 Subject: [PATCH 03/12] Revert "[nrf noup] soc: nordic: Disable DCACHE for nrf54h20" This reverts commit 8b779e600cf58fa471727238209b729fa113107e. Signed-off-by: Georgios Vasilakis --- soc/nordic/nrf54h/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From c3f7c6912cdbad5a4fac2d7b63058b4478d59131 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:09 +0100 Subject: [PATCH 04/12] Revert "[nrf noup] entropy: Add reqs for PSA RNG on nrf54h20" This reverts commit 3e1567545f0ee163d6bca63e8eba866d9c285b1f. Signed-off-by: Georgios Vasilakis --- drivers/entropy/Kconfig.psa_crypto | 1 - 1 file changed, 1 deletion(-) 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. From f43338632a4af9f52aa3804cc9f7c9a8b20662b1 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:10 +0100 Subject: [PATCH 05/12] Revert "[nrf noup] boards: nordic: Enable PSA RNG for nrf54h20" This reverts commit 955e277828fb918bfb795bf4df7c9fd5fe12e1f1. Signed-off-by: Georgios Vasilakis --- .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 6 +++--- .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts index 920907f3c69..3a1c8abf0f5 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"; }; }; diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts index f57b00fceda..8734ff9f745 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts @@ -27,17 +27,16 @@ 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 { From be34b9fcf6eee6eaff17fcae24fd8074edb1a40e Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:11 +0100 Subject: [PATCH 06/12] Revert "[nrf fromtree] tests: tls_configurations: adjust Kconfig in overlay-ec" This reverts commit 31f99478289e150018952b34d2889687ed94abbe. Signed-off-by: Georgios Vasilakis --- tests/net/socket/tls_configurations/overlay-ec.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 From a2797e7358ce5bf92e036d5fe35381b641ac1ae8 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:12 +0100 Subject: [PATCH 07/12] Revert "[nrf fromtree] tests: arm_thread_swap: Add overlay for nRF54H20" This reverts commit be90907c2d724872de720ffdc665a4b24efde60f. Signed-off-by: Georgios Vasilakis --- .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay 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"; -}; From ed9a53f8f8e2b3f01292e0ff1ca9ce6dbb8d2f9d Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:14 +0100 Subject: [PATCH 08/12] Revert "[nrf fromtree] boards: nordic: nrf54h20: Increase default MAX_THREAD_BYTES" This reverts commit e7245801bbc5419296a36b2c4e2e1a5b47e485e1. Signed-off-by: Georgios Vasilakis --- boards/nordic/nrf54h20dk/Kconfig.defconfig | 6 ------ 1 file changed, 6 deletions(-) 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 From 9c4dc8f6fcf7cceaaa08489a1b59d55770d3ccc5 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:15 +0100 Subject: [PATCH 09/12] Revert "[nrf fromtree] boards: nordic: Enable IPC and bellboard on nRF54H20" This reverts commit 248710e4825da1e6c7e0cbe31604e4e4a214d5b4. Signed-off-by: Georgios Vasilakis --- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts | 5 ----- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 9 --------- 2 files changed, 14 deletions(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts index 3a1c8abf0f5..171732d81e6 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts @@ -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 8734ff9f745..049617e6dc6 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts @@ -43,10 +43,6 @@ status = "okay"; }; -&cpurad_ram0x_region { - status = "okay"; -}; - &cpurad_bellboard { status = "okay"; interrupts = <96 NRF_DEFAULT_IRQ_PRIORITY>; @@ -64,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"; From 70dbee0b2ebfc1ae4eadee54447d8613f81ab212 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:16 +0100 Subject: [PATCH 10/12] Revert "[nrf fromtree] boards: nordic: Fix cpuapp_ram0x_region reg value." This reverts commit be85a6490cdaa23cfb08e3c5d7abe48d868f5f8d. Signed-off-by: Georgios Vasilakis --- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi index 165fa12ba80..8dc6ef757e9 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi @@ -27,7 +27,7 @@ cpuapp_ram0x_region: memory@2f011000 { compatible = "nordic,owned-memory"; - reg = <0x2f011000 DT_SIZE_K(260)>; + reg = <0x2f010000 DT_SIZE_K(260)>; status = "disabled"; nordic,access = ; #address-cells = <1>; From 287e41d66de2a7c14f7d86d3c95f4eb474ac138f Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:17 +0100 Subject: [PATCH 11/12] Revert "[nrf fromtree] boards: nordic: Rearrange ram0x regions." This reverts commit 68fdeb17ed73f7989423189a215bab5ff6ca670a. Signed-off-by: Georgios Vasilakis --- .../nrf54h20dk_nrf54h20-memory_map.dtsi | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi index 8dc6ef757e9..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 = <0x2f010000 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 { From 537a9ab3ebc8c39608e7349318f5568d90e0e214 Mon Sep 17 00:00:00 2001 From: Georgios Vasilakis Date: Mon, 13 Jan 2025 10:48:33 +0100 Subject: [PATCH 12/12] Revert "[nrf fromtree] tests: portability: cmsis_rtos_v2: do not disable 64-bit timeouts" This reverts commit 89fa63dffce774b26e8ca647dc91e2ebff0fbead. Signed-off-by: Georgios Vasilakis --- tests/subsys/portability/cmsis_rtos_v2/prj.conf | 1 + 1 file changed, 1 insertion(+) 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