diff --git a/boards/nordic/nrf9280pdk/Kconfig.defconfig b/boards/nordic/nrf9280pdk/Kconfig.defconfig index 24669fc7f1e6..055c6c8be253 100644 --- a/boards/nordic/nrf9280pdk/Kconfig.defconfig +++ b/boards/nordic/nrf9280pdk/Kconfig.defconfig @@ -4,17 +4,6 @@ config HW_STACK_PROTECTION default ARCH_HAS_STACK_PROTECTION -if BOARD_NRF9280PDK_NRF9280_CPUAPP - -config BT_HCI_IPC - default y if BT - -endif # BOARD_NRF9280PDK_NRF9280_CPUAPP - -if BOARD_NRF9280PDK_NRF9280_CPURAD - -endif # BOARD_NRF9280PDK_NRF9280_CPURAD - if BOARD_NRF9280PDK_NRF9280_CPUPPR # As PPR has limited memory most of tests does not fit with asserts enabled. @@ -23,7 +12,7 @@ config ASSERT endif # BOARD_NRF9280PDK_NRF9280_CPUPPR -if BOARD_NRF9280PDK_NRF9280_CPUAPP_IRON +if BOARD_NRF9280PDK_NRF9280_CPUAPP config ROM_START_OFFSET default 0x800 if BOOTLOADER_MCUBOOT @@ -31,4 +20,4 @@ config ROM_START_OFFSET config FLASH_LOAD_OFFSET default $(dt_nodelabel_reg_addr_hex,cpuapp_boot_partition) if !USE_DT_CODE_PARTITION -endif # BOARD_NRF9280PDK_NRF9280_CPUAPP_IRON +endif # BOARD_NRF9280PDK_NRF9280_CPUAPP diff --git a/boards/nordic/nrf9280pdk/Kconfig.nrf9280pdk b/boards/nordic/nrf9280pdk/Kconfig.nrf9280pdk index d66fe31da884..e46ff337ff56 100644 --- a/boards/nordic/nrf9280pdk/Kconfig.nrf9280pdk +++ b/boards/nordic/nrf9280pdk/Kconfig.nrf9280pdk @@ -2,9 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NRF9280PDK - select SOC_NRF9280_CPUAPP if (BOARD_NRF9280PDK_NRF9280_CPUAPP || \ - BOARD_NRF9280PDK_NRF9280_CPUAPP_IRON) + select SOC_NRF9280_CPUAPP if BOARD_NRF9280PDK_NRF9280_CPUAPP select SOC_NRF9280_CPURAD if BOARD_NRF9280PDK_NRF9280_CPURAD select SOC_NRF9280_CPUPPR if (BOARD_NRF9280PDK_NRF9280_CPUPPR || \ BOARD_NRF9280PDK_NRF9280_CPUPPR_XIP) - select SOC_NRF9280_IRON if BOARD_NRF9280PDK_NRF9280_CPUAPP_IRON diff --git a/boards/nordic/nrf9280pdk/board.yml b/boards/nordic/nrf9280pdk/board.yml index 274b9a84a7b7..c9216bbb9fb6 100644 --- a/boards/nordic/nrf9280pdk/board.yml +++ b/boards/nordic/nrf9280pdk/board.yml @@ -7,8 +7,6 @@ board: variants: - name: xip cpucluster: cpuppr - - name: iron - cpucluster: cpuapp revision: format: major.minor.patch default: 0.2.0 diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi index 0588e8d08018..94ef517601e7 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf.dtsi @@ -7,17 +7,17 @@ / { ipc { cpusec_cpuapp_ipc: ipc-1-2 { - compatible = "zephyr,ipc-icmsg"; + compatible = "nordic,ironside-call"; status = "disabled"; - dcache-alignment = <32>; + memory-region = <&cpusec_cpuapp_ipc_shm>; mboxes = <&cpusec_bellboard 12>, <&cpuapp_bellboard 0>; }; cpusec_cpurad_ipc: ipc-1-3 { - compatible = "zephyr,ipc-icmsg"; + compatible = "nordic,ironside-call"; status = "disabled"; - dcache-alignment = <32>; + memory-region = <&cpusec_cpurad_ipc_shm>; mboxes = <&cpusec_bellboard 18>, <&cpurad_bellboard 0>; }; @@ -33,6 +33,7 @@ cpuapp_cpusys_ipc: ipc-2-12 { compatible = "zephyr,ipc-icmsg"; status = "disabled"; + unbound = "enable"; dcache-alignment = <32>; mboxes = <&cpuapp_bellboard 6>, <&cpusys_vevif 12>; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf_iron.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf_iron.dtsi deleted file mode 100644 index a44db40538d2..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-ipc_conf_iron.dtsi +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/* This file is to be merged with the original ipc_conf.dtsi in the future. */ - -/ { - ipc { - /delete-node/ ipc-1-2; - /delete-node/ ipc-1-3; - - cpusec_cpuapp_ipc: ipc-1-2 { - compatible = "nordic,ironside-call"; - memory-region = <&cpusec_cpuapp_ipc_shm>; - mboxes = <&cpusec_bellboard 12>, - <&cpuapp_bellboard 0>; - status = "disabled"; - }; - - cpusec_cpurad_ipc: ipc-1-3 { - compatible = "nordic,ironside-call"; - memory-region = <&cpusec_cpurad_ipc_shm>; - mboxes = <&cpusec_bellboard 18>, - <&cpurad_bellboard 0>; - status = "disabled"; - }; - }; -}; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi index 67c70f1d38b5..3823fe27e58f 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi @@ -38,14 +38,6 @@ #size-cells = <1>; ranges = <0x0 0x2f012000 0x81000>; - cpusec_cpuapp_ipc_shm: memory@0 { - reg = <0x0 DT_SIZE_K(2)>; - }; - - cpuapp_cpusec_ipc_shm: memory@800 { - reg = <0x800 DT_SIZE_K(2)>; - }; - cpuapp_data: memory@1000 { reg = <0x1000 DT_SIZE_K(512)>; }; @@ -98,12 +90,27 @@ }; }; - cpuapp_cpusys_ipc_shm: memory@2f88fce0 { - reg = <0x2f88fce0 0x80>; + /* Workaround for a data cache related issue with SoC1.1, use secure addresses + * for cpuapp_cpusys_ipc_shm, cpusys_cpuapp_ipc_shm and cpusec_cpuapp_ipc_shm. + */ + cpuapp_cpusys_ipc_shm: memory@3f88f600 { + reg = <0x3f88f600 0x80>; }; - cpusys_cpuapp_ipc_shm: memory@2f88fd60 { - reg = <0x2f88fd60 0x80>; + cpusys_cpuapp_ipc_shm: memory@3f88f680 { + reg = <0x3f88f680 0x80>; + }; + + cpusec_cpuapp_ipc_shm: memory@3f88fb80 { + reg = <0x3f88fb80 0x80>; + }; + + cpuapp_ironside_se_event_report: memory@2f88fc00 { + reg = <0x2f88fc00 0x100>; + }; + + cpuapp_ironside_se_boot_report: memory@2f88fd00 { + reg = <0x2f88fd00 0x200>; }; cpurad_cpusys_ipc_shm: memory@2f88fe00 { @@ -178,57 +185,64 @@ }; &mram1x { - cpurad_rx_partitions: cpurad-rx-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; + partitions { + compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; - cpurad_slot0_partition: partition@402000 { - reg = <0x402000 DT_SIZE_K(256)>; + cpuapp_boot_partition: partition@312000 { + reg = <0x312000 DT_SIZE_K(64)>; }; - }; - cpuapp_rx_partitions: cpuapp-rx-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; + cpuapp_slot0_partition: partition@322000 { + reg = <0x322000 DT_SIZE_K(336)>; + }; - cpuapp_slot0_partition: partition@442000 { - reg = <0x442000 DT_SIZE_K(1024)>; + cpuapp_slot1_partition: partition@376000 { + reg = <0x376000 DT_SIZE_K(440)>; }; - cpuppr_code_partition: partition@542000 { - reg = <0x542000 DT_SIZE_K(64)>; + cpuppr_code_partition: partition@3E4000 { + reg = <0x3E4000 DT_SIZE_K(64)>; }; - }; - cpuapp_rw_partitions: cpuapp-rw-partitions { - compatible = "nordic,owned-partitions", "fixed-partitions"; - status = "disabled"; - nordic,access = ; - #address-cells = <1>; - #size-cells = <1>; + cpuflpr_code_partition: partition@3F4000 { + reg = <0x3F4000 DT_SIZE_K(48)>; + }; - dfu_partition: partition@600000 { - reg = <0x600000 DT_SIZE_K(512)>; + cpurad_slot0_partition: partition@400000 { + reg = <0x400000 DT_SIZE_K(336)>; }; - storage_partition: partition@680000 { - reg = <0x680000 DT_SIZE_K(24)>; + cpurad_slot1_partition: partition@454000 { + reg = <0x454000 DT_SIZE_K(336)>; }; - }; - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + storage_partition: partition@600000 { + reg = <0x600000 DT_SIZE_K(40)>; + }; periphconf_partition: partition@60a000 { reg = <0x60a000 DT_SIZE_K(8)>; }; + + /* 0x60c000 was chosen for secure_storage_partition such that + * it resides in the beginning of MRAM11 in storage partition. + */ + secure_storage_partition: partition@60c000 { + compatible = "fixed-subpartitions"; + reg = <0x60c000 DT_SIZE_K(8)>; + ranges = <0x0 0x60c000 0x2000>; + #address-cells = <1>; + #size-cells = <1>; + + cpuapp_crypto_partition: partition@0 { + reg = <0x0 DT_SIZE_K(4)>; + }; + + cpuapp_its_partition: partition@1000 { + reg = <0x1000 DT_SIZE_K(4)>; + }; + }; }; }; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map_iron.dtsi b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map_iron.dtsi deleted file mode 100644 index fba2e0fb6c2d..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map_iron.dtsi +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -/* This file is to be merged with the original memory_map.dtsi in the future. - * The following nodes will be replaced: - */ -/delete-node/ &cpuapp_cpusys_ipc_shm; -/delete-node/ &cpusec_cpuapp_ipc_shm; -/delete-node/ &cpusys_cpuapp_ipc_shm; -/delete-node/ &cpuapp_rw_partitions; -/delete-node/ &cpuapp_rx_partitions; -/delete-node/ &cpurad_rx_partitions; - -/ { - reserved-memory { - /* Workaround for a data cache related issue with SoC1.1, use secure addresses - * for cpuapp_cpusys_ipc_shm, cpusys_cpuapp_ipc_shm and cpusec_cpuapp_ipc_shm. - */ - cpuapp_cpusys_ipc_shm: memory@3f88f600 { - reg = <0x3f88f600 0x80>; - }; - - cpusys_cpuapp_ipc_shm: memory@3f88f680 { - reg = <0x3f88f680 0x80>; - }; - - cpusec_cpuapp_ipc_shm: memory@3f88fb80 { - reg = <0x3f88fb80 0x80>; - }; - - cpuapp_ironside_se_event_report: memory@2f88fc00 { - reg = <0x2f88fc00 0x100>; - }; - - cpuapp_ironside_se_boot_report: memory@2f88fd00 { - reg = <0x2f88fd00 0x200>; - }; - }; -}; - -&mram1x { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - cpuapp_boot_partition: partition@312000 { - reg = <0x312000 DT_SIZE_K(64)>; - }; - - cpuapp_slot0_partition: partition@322000 { - reg = <0x322000 DT_SIZE_K(336)>; - }; - - cpuapp_slot1_partition: partition@376000 { - reg = <0x376000 DT_SIZE_K(440)>; - }; - - cpuppr_code_partition: partition@3E4000 { - reg = <0x3E4000 DT_SIZE_K(64)>; - }; - - cpuflpr_code_partition: partition@3F4000 { - reg = <0x3F4000 DT_SIZE_K(48)>; - }; - - cpurad_slot0_partition: partition@400000 { - reg = <0x400000 DT_SIZE_K(336)>; - }; - - cpurad_slot1_partition: partition@454000 { - reg = <0x454000 DT_SIZE_K(336)>; - }; - - storage_partition: partition@600000 { - reg = <0x600000 DT_SIZE_K(40)>; - }; - - periphconf_partition: partition@60a000 { - reg = <0x60a000 DT_SIZE_K(8)>; - }; - - /* 0x60c000 was chosen for secure_storage_partition such that - * it resides in the beginning of MRAM11 in storage partition. - */ - secure_storage_partition: partition@60c000 { - compatible = "fixed-subpartitions"; - reg = <0x60c000 DT_SIZE_K(8)>; - ranges = <0x0 0x60c000 0x2000>; - #address-cells = <1>; - #size-cells = <1>; - - cpuapp_crypto_partition: partition@0 { - reg = <0x0 DT_SIZE_K(4)>; - }; - - cpuapp_its_partition: partition@1000 { - reg = <0x1000 DT_SIZE_K(4)>; - }; - }; - }; -}; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts index 19dd5e208063..e13022d06c13 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts @@ -20,10 +20,11 @@ chosen { zephyr,console = &uart136; - zephyr,code-partition = &cpuapp_slot0_partition; + zephyr,code-partition = &slot0_partition; zephyr,flash = &mram1x; zephyr,sram = &cpuapp_data; zephyr,shell-uart = &uart136; + zephyr,uart-mcumgr = &uart136; zephyr,bt-hci = &bt_hci_ipc0; nordic,802154-spinel-ipc = &ipc0; zephyr,entropy = &psa_rng; @@ -149,14 +150,17 @@ status = "okay"; }; +&cpusec_bellboard { + status = "okay"; +}; + &cpusys_vevif { status = "okay"; }; &cpusec_cpuapp_ipc { mbox-names = "tx", "rx"; - tx-region = <&cpuapp_cpusec_ipc_shm>; - rx-region = <&cpusec_cpuapp_ipc_shm>; + status = "okay"; }; ipc0: &cpuapp_cpurad_ipc { @@ -190,12 +194,18 @@ ipc0: &cpuapp_cpurad_ipc { status = "okay"; }; -&cpuapp_rx_partitions { - status = "okay"; +ironside_se_boot_report: &cpuapp_ironside_se_boot_report {}; + +boot_partition: &cpuapp_boot_partition { + label = "mcuboot"; }; -&cpuapp_rw_partitions { - status = "okay"; +slot0_partition: &cpuapp_slot0_partition { + label = "image-0"; +}; + +slot1_partition: &cpuapp_slot1_partition { + label = "image-1"; }; &cpuppr_vpr { diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml index d4bc799100dd..68babc33bcf3 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.yaml @@ -7,6 +7,7 @@ type: mcu arch: arm toolchain: - gnuarmemb + - xtools - zephyr sysbuild: true ram: 512 diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_defconfig b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_defconfig index d3ce90b8a380..5b27932f7855 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_defconfig +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_defconfig @@ -8,8 +8,6 @@ CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y -CONFIG_USE_DT_CODE_PARTITION=y - # Enable MPU CONFIG_ARM_MPU=y diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.dts deleted file mode 100644 index a3ca908f59de..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.dts +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "nrf9280pdk_nrf9280_cpuapp.dts" -#include "nrf9280pdk_nrf9280-ipc_conf_iron.dtsi" -#include "nrf9280pdk_nrf9280-memory_map_iron.dtsi" - -/delete-node/ &cpusec_cpurad_ipc; - -/ { - chosen { - zephyr,code-partition = &slot0_partition; - zephyr,uart-mcumgr = &uart136; - }; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -&cpusec_cpuapp_ipc { - mbox-names = "tx", "rx"; - status = "okay"; -}; - -ironside_se_boot_report: &cpuapp_ironside_se_boot_report {}; - -boot_partition: &cpuapp_boot_partition { - label = "mcuboot"; -}; - -slot0_partition: &cpuapp_slot0_partition { - label = "image-0"; -}; - -slot1_partition: &cpuapp_slot1_partition { - label = "image-1"; -}; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.yaml b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.yaml deleted file mode 100644 index 029f133993bf..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -identifier: nrf9280pdk/nrf9280/cpuapp/iron -name: nRF9280-DK-nRF9280-Application -type: mcu -arch: arm -toolchain: - - gnuarmemb - - xtools - - zephyr -sysbuild: true -ram: 512 -flash: 1024 -supported: - - adc - - counter - - gpio - - i2c - - pwm - - spi - - watchdog - - usbd diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_0_2_0.overlay b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_0_2_0.overlay deleted file mode 100644 index 4fa3f667eadd..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_0_2_0.overlay +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include "nrf9280pdk_nrf9280-pinctrl_0_2_0.dtsi" - -/ { - aliases { - pwm-led0 = &pwm_led2; /* Alias for compatibility with samples that use pwm-led0 */ - }; - - leds { - compatible = "gpio-leds"; - - led0: led_0 { - gpios = <&gpio9 0 GPIO_ACTIVE_HIGH>; - label = "Green LED 0"; - }; - - led1: led_1 { - gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; - label = "Green LED 1"; - }; - - led2: led_2 { - gpios = <&gpio9 2 GPIO_ACTIVE_HIGH>; - label = "Green LED 2"; - }; - - led3: led_3 { - gpios = <&gpio9 3 GPIO_ACTIVE_HIGH>; - label = "Green LED 3"; - }; - }; - - pwmleds { - compatible = "pwm-leds"; - - /delete-node/ pwm_led_0; - - /* - * There is no valid hardware configuration to pass PWM signal on pins 0 and 1. - * First valid config is P9.2. This corresponds to LED 2. - * Signal on PWM130's channel 0 can be passed directly on GPIO Port 9 pin 2. - */ - pwm_led2: pwm_led_2 { - pwms = <&pwm130 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - }; - }; -}; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_defconfig b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_defconfig deleted file mode 100644 index 01f3bec39321..000000000000 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp_iron_defconfig +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -# Enable UART driver -CONFIG_SERIAL=y - -# Enable console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y - -# Enable MPU -CONFIG_ARM_MPU=y - -# Enable hardware stack protection -CONFIG_HW_STACK_PROTECTION=y - -# MPU-based null-pointer dereferencing detection cannot be applied -# as the (0x0 - 0x400) region is unmapped for this target. -CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y - -# Enable cache -CONFIG_CACHE_MANAGEMENT=y -CONFIG_EXTERNAL_CACHE=y - -# Enable GPIO -CONFIG_GPIO=y - -# UICR generation is not supported, and when reintroduced will not use nrf-regtool. -CONFIG_NRF_REGTOOL_GENERATE_UICR=n diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts index 91d967ea34aa..17c482e7865c 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts @@ -25,6 +25,7 @@ zephyr,flash = &mram1x; zephyr,sram = &cpurad_ram0; zephyr,shell-uart = &uart135; + zephyr,uart-mcumgr = &uart135; zephyr,ieee802154 = &cpurad_ieee802154; zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; @@ -68,8 +69,6 @@ &cpusec_cpurad_ipc { mbox-names = "tx", "rx"; - tx-region = <&cpurad_cpusec_ipc_shm>; - rx-region = <&cpusec_cpurad_ipc_shm>; }; ipc0: &cpuapp_cpurad_ipc { @@ -92,10 +91,6 @@ ipc0: &cpuapp_cpurad_ipc { status = "okay"; }; -&cpurad_rx_partitions { - status = "okay"; -}; - &grtc { status = "okay"; }; diff --git a/samples/drivers/watchdog/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay b/samples/drivers/watchdog/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay deleted file mode 100644 index 102abfc8ef27..000000000000 --- a/samples/drivers/watchdog/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2025 Nordic Semiconductor ASA - * SPDX-License-Identifier: Apache-2.0 - */ - -&wdt010 { - status = "okay"; -}; diff --git a/soc/nordic/ironside/Kconfig b/soc/nordic/ironside/Kconfig index ff1d01f99e81..63914c3eb657 100644 --- a/soc/nordic/ironside/Kconfig +++ b/soc/nordic/ironside/Kconfig @@ -3,7 +3,7 @@ config NRF_IRONSIDE bool - depends on SOC_NRF54H20 || SOC_NRF9280_IRON + depends on SOC_NRF54H20 || SOC_NRF9280 help This is selected by drivers interacting with Nordic IronSide firmware. @@ -28,7 +28,7 @@ config NRF_IRONSIDE_CALL_INIT_PRIORITY endif # NRF_IRONSIDE_CALL menu "Nordic IronSide services" - depends on SOC_NRF54H20 || SOC_NRF9280_IRON + depends on SOC_NRF54H20 || SOC_NRF9280 config NRF_IRONSIDE_CPUCONF_SERVICE bool "IronSide CPUCONF service" diff --git a/soc/nordic/nrf92/Kconfig b/soc/nordic/nrf92/Kconfig index eea33654f57d..739aada2b26e 100644 --- a/soc/nordic/nrf92/Kconfig +++ b/soc/nordic/nrf92/Kconfig @@ -9,6 +9,7 @@ config SOC_SERIES_NRF92X select HAS_NORDIC_DRIVERS select SOC_EARLY_INIT_HOOK if ARM select NRF_PLATFORM_HALTIUM + select EXPERIMENTAL if MCUBOOT config SOC_NRF9230_ENGB_CPUAPP select ARM @@ -51,6 +52,3 @@ config SOC_NRF9230_ENGB_CPURAD config SOC_NRF9230_ENGB_CPUPPR select RISCV_CORE_NORDIC_VPR - -config SOC_NRF9280_IRON - select EXPERIMENTAL if MCUBOOT diff --git a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuapp b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuapp index 350f44b5c24e..22ba6612ecfb 100644 --- a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuapp +++ b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpuapp @@ -8,7 +8,4 @@ if SOC_NRF9280_CPUAPP config NUM_IRQS default 471 -config NRF_REGTOOL_GENERATE_UICR - default y - endif # SOC_NRF9280_CPUAPP diff --git a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpurad b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpurad index 9b17a6b988cd..534658997fbe 100644 --- a/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpurad +++ b/soc/nordic/nrf92/Kconfig.defconfig.nrf9280_cpurad @@ -8,7 +8,4 @@ if SOC_NRF9280_CPURAD config NUM_IRQS default 471 -config NRF_REGTOOL_GENERATE_UICR - default y - endif # SOC_NRF9280_CPURAD diff --git a/soc/nordic/nrf92/Kconfig.soc b/soc/nordic/nrf92/Kconfig.soc index 6ad2fb8a0147..99fc28643b74 100644 --- a/soc/nordic/nrf92/Kconfig.soc +++ b/soc/nordic/nrf92/Kconfig.soc @@ -62,10 +62,5 @@ config SOC_NRF9280_CPUPPR help nRF9280 CPUPPR -config SOC_NRF9280_IRON - bool - help - Indicates that local domain firmware is compatible with Nordic IronSide SE. - config SOC default "nrf9280" if SOC_NRF9280 diff --git a/tests/drivers/adc/adc_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay b/tests/drivers/adc/adc_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay deleted file mode 100644 index cd9ca89b82a3..000000000000 --- a/tests/drivers/adc/adc_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright (c) 2025 Nordic Semiconductor ASA - */ - -#include "nrf9280pdk_nrf9280_common.dtsi" diff --git a/tests/drivers/watchdog/wdt_basic_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay b/tests/drivers/watchdog/wdt_basic_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay deleted file mode 100644 index 102abfc8ef27..000000000000 --- a/tests/drivers/watchdog/wdt_basic_api/boards/nrf9280pdk_nrf9280_cpuapp_iron.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright 2025 Nordic Semiconductor ASA - * SPDX-License-Identifier: Apache-2.0 - */ - -&wdt010 { - status = "okay"; -};