Skip to content

Commit 95374a2

Browse files
committed
dump
Signed-off-by: Håkon Amundsen <[email protected]>
1 parent 7fe2732 commit 95374a2

7 files changed

+121
-5
lines changed

boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
config BOARD_NRF54H20DK
5-
select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
6-
select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
5+
select SOC_NRF54H20_CPUAPP if (BOARD_NRF54H20DK_NRF54H20_CPUAPP || \
6+
BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON)
7+
select SOC_NRF54H20_CPURAD if (BOARD_NRF54H20DK_NRF54H20_CPURAD || \
8+
BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON)
79
select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
810
BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP)
911
select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
1012
BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP)
13+
14+
config IRON
15+
bool
16+
default y if BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON || BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON

boards/nordic/nrf54h20dk/board.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ board:
99
cpucluster: cpuppr
1010
- name: xip
1111
cpucluster: cpuflpr
12+
- name: iron
13+
cpucluster: cpuapp
14+
- name: iron
15+
cpucluster: cpurad
1216
revision:
1317
format: major.minor.patch
1418
default: "0.9.0"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#include "nrf54h20dk_nrf54h20_cpuapp.dts"
8+
9+
/delete-node/&cpurad_rx_partitions;
10+
/delete-node/&cpuapp_rx_partitions;
11+
12+
/* This is not yet an exhaustive memory map, and contain only a minimum required to boot
13+
* the application core.
14+
*/
15+
16+
&mram1x {
17+
cpuapp_rx_partitions: cpuapp-rx-partitions {
18+
compatible = "nordic,owned-partitions", "fixed-partitions";
19+
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RXS>;
20+
#address-cells = <1>;
21+
#size-cells = <1>;
22+
23+
cpuapp_slot0_partition: partition@2c000 {
24+
reg = <0x2c000 DT_SIZE_K(480)>;
25+
};
26+
27+
cpuppr_code_partition: partition@a4000 {
28+
reg = <0xa4000 DT_SIZE_K(64)>;
29+
};
30+
31+
cpuflpr_code_partition: partition@b4000 {
32+
reg = <0xb4000 DT_SIZE_K(48)>;
33+
};
34+
};
35+
36+
cpurad_rx_partitions: cpurad-rx-partitions {
37+
compatible = "nordic,owned-partitions", "fixed-partitions";
38+
status = "disabled";
39+
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
40+
#address-cells = <1>;
41+
#size-cells = <1>;
42+
43+
cpurad_slot0_partition: partition@c0000 {
44+
reg = <0xc0000 DT_SIZE_K(256)>;
45+
};
46+
};
47+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright (c) 2024 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
identifier: nrf54h20dk/nrf54h20/cpuapp/iron
5+
name: nRF54H20-DK-nRF54H20-Application (IRONside compatible) (revision 0.9.0)
6+
type: mcu
7+
arch: arm
8+
toolchain:
9+
- gnuarmemb
10+
- xtools
11+
- zephyr
12+
sysbuild: true
13+
ram: 256
14+
flash: 296
15+
supported:
16+
- adc
17+
- can
18+
- counter
19+
- gpio
20+
- i2c
21+
- pwm
22+
- retained_mem
23+
- spi
24+
- watchdog
25+
- usbd
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Copyright (c) 2024 Nordic Semiconductor ASA
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
# Enable UART driver
5+
CONFIG_SERIAL=y
6+
7+
# Enable console
8+
CONFIG_CONSOLE=y
9+
CONFIG_UART_CONSOLE=y
10+
11+
CONFIG_USE_DT_CODE_PARTITION=y
12+
13+
# Enable MPU
14+
CONFIG_ARM_MPU=y
15+
16+
# Enable hardware stack protection
17+
CONFIG_HW_STACK_PROTECTION=y
18+
19+
# MPU-based null-pointer dereferencing detection cannot be applied
20+
# as the (0x0 - 0x400) region is unmapped for this target.
21+
CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
22+
23+
# Enable cache
24+
CONFIG_CACHE_MANAGEMENT=y
25+
CONFIG_EXTERNAL_CACHE=y
26+
27+
# Enable GPIO
28+
CONFIG_GPIO=y
29+
30+
# UICR generation is not supported, and when reintroduced will not use nrf-regtool.
31+
CONFIG_NRF_REGTOOL_GENERATE_UICR=n
32+
# SSF is not yet enabled - disable this so local domains don't hang at the start
33+
CONFIG_SSF_CLIENT_SYS_INIT=n
34+
# SUIT is no longer used
35+
CONFIG_SUIT=n

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2024 Nordic Semiconductor ASA
22
# SPDX-License-Identifier: Apache-2.0
33

4-
identifier: nrf54h20dk/nrf54h20/cpurad
5-
name: nRF54H20-DK-nRF54H20-Radio (revision 0.9.0)
4+
identifier: nrf54h20dk/nrf54h20/cpurad/iron
5+
name: nRF54H20-DK-nRF54H20-Radio (IRONside compatible) (revision 0.9.0)
66
type: mcu
77
arch: arm
88
toolchain:

scripts/west_commands/runners/nrf_common.py

-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ def program_hex(self):
330330

331331
if self.erase:
332332
self.exec_op('erase', core='NRFDL_DEVICE_CORE_APPLICATION')
333-
self.exec_op('erase', core='NRFDL_DEVICE_CORE_NETWORK')
334333

335334
# Manage SUIT artifacts.
336335
# This logic should be executed only once per build.

0 commit comments

Comments
 (0)