diff --git a/applications/machine_learning/Kconfig.sysbuild b/applications/machine_learning/Kconfig.sysbuild index e1e697dec790..29012163e19e 100644 --- a/applications/machine_learning/Kconfig.sysbuild +++ b/applications/machine_learning/Kconfig.sysbuild @@ -26,7 +26,7 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY config ML_APP_INCLUDE_REMOTE_IMAGE bool "Include remote image build" - depends on SOC_NRF54H20_CPUAPP + depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config ML_APP_REMOTE_BOARD string "The name of the board to be used by remote image" diff --git a/applications/nrf_desktop/src/modules/Kconfig.dvfs b/applications/nrf_desktop/src/modules/Kconfig.dvfs index 8d83b5c6a936..8d72a5967e3b 100644 --- a/applications/nrf_desktop/src/modules/Kconfig.dvfs +++ b/applications/nrf_desktop/src/modules/Kconfig.dvfs @@ -6,7 +6,7 @@ menuconfig DESKTOP_DVFS bool "DVFS module [EXPERIMENTAL]" - depends on SOC_NRF54H20_CPUAPP + depends on SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP select EXPERIMENTAL select NRFS_DVFS_SERVICE_ENABLED select CLOCK_CONTROL diff --git a/samples/benchmarks/coremark/Kconfig b/samples/benchmarks/coremark/Kconfig index 0c36c65724fe..7e9863068bd7 100644 --- a/samples/benchmarks/coremark/Kconfig +++ b/samples/benchmarks/coremark/Kconfig @@ -7,8 +7,9 @@ menu "CoreMark sample" config APP_MODE_FLASH_AND_RUN - bool "Run CoreMark benchmark on start up" if !SOC_NRF54H20_CPUPPR - default y if SOC_NRF54H20_CPUPPR + bool "Run CoreMark benchmark on start up" if \ + !(SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR) + default y if SOC_NRF54H20_CPUPPR || SOC_NRF54H20_ENGB_CPUPPR help If enabled, CoreMark will start execution immediately after the CPU starts up. It also disables LEDs and buttons. diff --git a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig index f8433c3031c5..5dc104732f51 100644 --- a/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig +++ b/samples/peripheral/802154_phy_test/modules/app_rpc/zephyr/Kconfig @@ -6,6 +6,7 @@ config APP_RPC bool "Enables application module features requiring interaction between cores" - depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD + depends on SOC_NRF5340_CPUNET || SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP \ + || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD select NRF_RPC select NRF_RPC_CBOR diff --git a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi index 1ba8ae582379..b8165ea3181b 100644 --- a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi +++ b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_common.dtsi @@ -35,10 +35,6 @@ ipc0: &cpuapp_cpurad_ipc { status = "okay"; }; -&cpuapp_cpurad_ram0x_region { - status = "okay"; -}; - &cpurad_bellboard { status = "okay"; }; diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index b109a31f6d4c..9e6edfb3733e 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -6,7 +6,8 @@ cryptography>=42.0.4 imagesize>=1.2.0 intelhex pylint +setuptools==75.2.0 zcbor~=0.8.0 -nrf-regtool~=6.0.0 +nrf-regtool~=7.0.0 windows-curses; sys_platform == 'win32' unidiff diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index db23d9c9efda..270f6532615c 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -97,7 +97,7 @@ mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "4.0" mypy==1.13.0 ; python_version >= "3.10" and python_version < "4.0" natsort==8.4.0 ; python_version >= "3.10" and python_version < "4.0" normality==2.5.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" -nrf-regtool==6.0.0 ; python_version >= "3.10" and python_version < "4.0" +nrf-regtool==7.0.0 ; python_version >= "3.10" and python_version < "4.0" nrfcredstore==1.0.0 ; python_version >= "3.10" and python_version < "4.0" numpy==1.26.4 ; python_version >= "3.10" and python_version < "4.0" packageurl-python==0.16.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" diff --git a/snippets/hw-flow-control/boards/nrf52840dk_nrf52840.overlay b/snippets/hw-flow-control/boards/nrf52840dk_nrf52840.overlay deleted file mode 100644 index 330a442cdcdf..000000000000 --- a/snippets/hw-flow-control/boards/nrf52840dk_nrf52840.overlay +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&uart0 { - hw-flow-control; -}; diff --git a/snippets/hw-flow-control/boards/nrf52dk_nrf52832.overlay b/snippets/hw-flow-control/boards/nrf52dk_nrf52832.overlay deleted file mode 100644 index 330a442cdcdf..000000000000 --- a/snippets/hw-flow-control/boards/nrf52dk_nrf52832.overlay +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&uart0 { - hw-flow-control; -}; diff --git a/snippets/hw-flow-control/snippet.yml b/snippets/hw-flow-control/snippet.yml index 2d4f175e9fa4..471ecc6fb2b3 100644 --- a/snippets/hw-flow-control/snippet.yml +++ b/snippets/hw-flow-control/snippet.yml @@ -16,9 +16,3 @@ boards: nrf54l15dk/nrf54l15/cpuapp: append: EXTRA_DTC_OVERLAY_FILE: boards/nrf54l15dk_nrf54l15_cpuapp.overlay - nrf52840dk/nrf52840: - append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf52840dk_nrf52840.overlay - nrf52dk/nrf52832: - append: - EXTRA_DTC_OVERLAY_FILE: boards/nrf52dk_nrf52832.overlay diff --git a/subsys/bluetooth/controller/Kconfig b/subsys/bluetooth/controller/Kconfig index 642af9fb70ac..3fbcc6872b07 100644 --- a/subsys/bluetooth/controller/Kconfig +++ b/subsys/bluetooth/controller/Kconfig @@ -45,7 +45,7 @@ config BT_LL_SOFTDEVICE select BT_CTLR_SUBRATING_SUPPORT select BT_LL_SOFTDEVICE_HEADERS_INCLUDE depends on (SOC_SERIES_BSIM_NRFXX || SOC_SERIES_NRF52X || SOC_COMPATIBLE_NRF5340_CPUNET ||\ - SOC_NRF54H20_CPURAD || SOC_SERIES_NRF54LX) + SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_SERIES_NRF54LX) depends on DT_HAS_NORDIC_BT_HCI_SDC_ENABLED help Use SoftDevice Link Layer implementation. @@ -318,6 +318,7 @@ choice BT_LL_SOFTDEVICE_VARIANT BT_ISO || \ SOC_COMPATIBLE_NRF5340_CPUNET || \ SOC_NRF54H20_CPURAD || \ + SOC_NRF54H20_ENGB_CPURAD || \ SOC_SERIES_NRF54LX) default BT_LL_SOFTDEVICE_CENTRAL if BT_OBSERVER default BT_LL_SOFTDEVICE_PERIPHERAL if BT_BROADCASTER diff --git a/subsys/esb/Kconfig b/subsys/esb/Kconfig index e8bc2ce24ac2..ca9f07f6c271 100644 --- a/subsys/esb/Kconfig +++ b/subsys/esb/Kconfig @@ -150,7 +150,7 @@ config ESB_NEVER_DISABLE_TX config ESB_FAST_SWITCHING select EXPERIMENTAL - depends on !ESB_NEVER_DISABLE_TX && SOC_NRF54H20_CPURAD + depends on !ESB_NEVER_DISABLE_TX && (SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD) bool "Fast radio TX/RX and RX/TX switching [EXPERIMENTAL]" help This option enables fast switching between transmit (TX) and receive (RX) modes @@ -164,7 +164,7 @@ config ESB_FAST_SWITCHING config ESB_FAST_CHANNEL_SWITCHING select EXPERIMENTAL - depends on SOC_NRF54H20_CPURAD + depends on SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD bool "Fast radio channel switching [EXPERIMENTAL]" help This option enables fast radio channel switching. diff --git a/subsys/sdfw_services/Kconfig b/subsys/sdfw_services/Kconfig index 8247209ddec8..c9164afd3031 100644 --- a/subsys/sdfw_services/Kconfig +++ b/subsys/sdfw_services/Kconfig @@ -24,14 +24,14 @@ menu "SDFW Service Framework" config SSF_CLIENT_DOMAIN_ID int - default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default 3 if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default 2 if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP + default 3 if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD default 0 config SSF_CLIENT_NRF_RPC_GROUP_NAME string - default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF9280_CPUAPP - default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF9280_CPURAD + default "app" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP || SOC_NRF9280_CPUAPP + default "rad" if SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD || SOC_NRF9280_CPURAD default "" config SSF_CLIENT_SYS_INIT diff --git a/sysbuild/Kconfig.appcore b/sysbuild/Kconfig.appcore index a59ffeda2bd1..dc3bbd1d63bc 100644 --- a/sysbuild/Kconfig.appcore +++ b/sysbuild/Kconfig.appcore @@ -4,7 +4,7 @@ config SUPPORT_APPCORE bool - default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD) + default y if (SOC_NRF5340_CPUNET || SOC_NRF54H20_CPURAD || SOC_NRF54H20_ENGB_CPURAD) config APPCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string diff --git a/sysbuild/Kconfig.netcore b/sysbuild/Kconfig.netcore index 65c10bf27b7b..de0e8c27495b 100644 --- a/sysbuild/Kconfig.netcore +++ b/sysbuild/Kconfig.netcore @@ -10,12 +10,12 @@ config EXTERNAL_CONFIGURED_NETCORE config SUPPORT_NETCORE bool - default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP) + default y if (SOC_NRF5340_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP) config NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string default "cpunet" if SOC_NRF5340_CPUAPP - default "cpurad" if SOC_NRF54H20_CPUAPP + default "cpurad" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config NETCORE_REMOTE_DOMAIN string diff --git a/sysbuild/Kconfig.pprcore b/sysbuild/Kconfig.pprcore index a3f6e2e73a14..69eac4c04b51 100644 --- a/sysbuild/Kconfig.pprcore +++ b/sysbuild/Kconfig.pprcore @@ -4,8 +4,8 @@ config SUPPORT_PPRCORE bool - default y if SOC_NRF54H20_CPUAPP + default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP config PPRCORE_REMOTE_BOARD_TARGET_CPUCLUSTER string - default "cpuppr" if SOC_NRF54H20_CPUAPP + default "cpuppr" if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_ENGB_CPUAPP diff --git a/west.yml b/west.yml index 86b42073f4e1..5acf854e21cc 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 1405f9648ea1525cc1150f201ad380efdcde8538 + revision: e409c241400a56ad3e34eb2e944e6476cffd5f01 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -149,7 +149,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: be4538c1592057a2d0e1ce1b9aa055fdd3cfa0f5 + revision: e1c7188e52bf79ed5f9bba494a0cc8e9d7d05457 - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m @@ -246,7 +246,7 @@ manifest: upstream-sha: c6eaeda5a1c1c5dbb24dce7e027340cb8893a77b compare-by-default: false - name: suit-generator - revision: v2.8.0-rc1 + revision: 6ae3b387a7b075f4d4fb190c4d4939d4ac270dca path: modules/lib/suit-generator - name: suit-processor revision: v2.8.0-rc1