Skip to content

manifest: use proper sdk-zephyr sha for IRONSide nRF92 adaptations #22170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Draft

manifest: use proper sdk-zephyr sha for IRONSide nRF92 adaptations #22170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subsys/sdfw_services/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ config SSF_CLIENT
bool
def_bool $(dt_nodelabel_enabled_with_compat,cpusec_cpuapp_ipc,$(DT_COMPAT_ZEPHYR_IPC_ICMSG)) \
|| $(dt_nodelabel_enabled_with_compat,cpusec_cpurad_ipc,$(DT_COMPAT_ZEPHYR_IPC_ICMSG))
depends on !SOC_NRF54H20_IRON
depends on !SOC_NRF54H20_IRON && !SOC_NRF9280_IRON

config SDFW_SERVICES_ENABLED
bool
Expand Down
2 changes: 1 addition & 1 deletion subsys/suit/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

menuconfig SUIT
bool "Enable SUIT modules"
depends on !SOC_NRF54H20_IRON
depends on !SOC_NRF54H20_IRON && !SOC_NRF9280_IRON

if SUIT

Expand Down
2 changes: 1 addition & 1 deletion sysbuild/Kconfig.suit_provisioning
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ menu "SUIT provisioning"
config SUIT_MPI_GENERATE
bool "Generate SUIT Manifest Provisioning Information binary"
default y if SOC_SERIES_NRF54HX || SOC_SERIES_NRF92X
depends on !SOC_NRF54H20_IRON
depends on !SOC_NRF54H20_IRON && !SOC_NRF9280_IRON

if SUIT_MPI_GENERATE

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 893c3332454a29c1611fa90aa8ceaf87a6bdf848
revision: pull/2839/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading