Skip to content

Commit dc36e3e

Browse files
ayla-nordicsemiayla-nordicsemi
committed
Soc: move boot_report to common
1 parent d8921ee commit dc36e3e

File tree

14 files changed

+8
-122
lines changed

14 files changed

+8
-122
lines changed

‎soc/nordic/common/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ endif()
3838

3939
zephyr_library_sources_ifdef(CONFIG_NRF_SYS_EVENT nrf_sys_event.c)
4040
zephyr_library_sources_ifdef(CONFIG_MRAM_LATENCY mram_latency.c)
41+
add_subdirectory(ironside/se)

‎soc/nordic/common/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,4 @@ source "subsys/logging/Kconfig.template.log_config"
4949
endif # MRAM_LATENCY
5050

5151
rsource "vpr/Kconfig"
52+
rsource "ironside/se/Kconfig"

‎soc/nordic/nrf54h/ironside/se/CMakeLists.txt‎ renamed to ‎soc/nordic/common/ironside/se/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2025 Nordic Semiconductor
22
# SPDX-License-Identifier: Apache-2.0
33

4-
zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT ironside_se_boot_report.c)
4+
zephyr_library_sources_ifdef(CONFIG_SOC_NRF_IRONSIDE_SE_BOOT_REPORT ironside_se_boot_report.c)
55
zephyr_include_directories(include)

‎soc/nordic/nrf54h/ironside/se/Kconfig‎ renamed to ‎soc/nordic/common/ironside/se/Kconfig‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Copyright (c) 2025 Nordic Semiconductor
22
# SPDX-License-Identifier: Apache-2.0
33

4-
config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT
4+
config SOC_NRF_IRONSIDE_SE_BOOT_REPORT
55
bool "Nordic IRONside SE boot report"
6-
default y if SOC_NRF54H20_CPUAPP
7-
depends on SOC_NRF54H20_IRON
6+
default y if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP
7+
depends on SOC_NRF54H20_IRON || SOC_NRF9280_IRON
88
help
99
This option enables parsing of the Boot Report populated by Nordic IRONside SE.
1010

11-
config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_MAGIC
11+
config SOC_NRF_IRONSIDE_SE_BOOT_REPORT_MAGIC
1212
hex
1313
default 0x4d69546f
1414
help

‎soc/nordic/nrf54h/ironside/se/include/nrf/ironside_se_boot_report.h‎ renamed to ‎soc/nordic/common/ironside/se/include/nrf/ironside_se_boot_report.h‎

File renamed without changes.

‎soc/nordic/nrf54h/ironside/se/ironside_se_boot_report.c‎ renamed to ‎soc/nordic/common/ironside/se/ironside_se_boot_report.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <nrf/ironside_se_boot_report.h>
99

1010
#define IRONSIDE_SE_BOOT_REPORT_ADDR DT_REG_ADDR(DT_NODELABEL(cpuapp_ironside_se_boot_report))
11-
#define IRONSIDE_SE_BOOT_REPORT_MAGIC CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_MAGIC
11+
#define IRONSIDE_SE_BOOT_REPORT_MAGIC CONFIG_SOC_NRF_IRONSIDE_SE_BOOT_REPORT_MAGIC
1212

1313
int ironside_se_boot_report_get(const struct ironside_se_boot_report **report)
1414
{

‎soc/nordic/nrf54h/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
1818

1919
add_subdirectory(bicr)
2020
add_subdirectory(gpd)
21-
add_subdirectory(ironside/se)

‎soc/nordic/nrf54h/Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,3 @@ config SOC_NRF54H20_IRON
9191

9292
rsource "bicr/Kconfig"
9393
rsource "gpd/Kconfig"
94-
rsource "ironside/se/Kconfig"

‎soc/nordic/nrf92/CMakeLists.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ zephyr_include_directories(.)
1010
# Ensure that image size aligns with 16 bytes so that MRAMC finalizes all writes
1111
# for the image correctly
1212
zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
13-
14-
# TODO : to be removed once ironside/se boot report is moved to common
15-
add_subdirectory(ironside/se)

‎soc/nordic/nrf92/Kconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,3 @@ config SOC_NRF9230_ENGB_CPUPPR
5252

5353
config SOC_NRF9280_IRON
5454
select EXPERIMENTAL if MCUBOOT
55-
56-
# TODO : to be removed once ironside/se boot report is moved to common
57-
rsource "ironside/se/Kconfig"

0 commit comments

Comments
 (0)