Skip to content

manifest: sdk-zephyr: Nrf54h20 fromtree oct25 #24914

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

Merged
merged 2 commits into from
Oct 15, 2025
Merged

manifest: sdk-zephyr: Nrf54h20 fromtree oct25 #24914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f319c
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Oct 8, 2025
fe17cd7
samples: benchmarks: coremark: Align nrf54h20
karstenkoenig Oct 8, 2025
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
1 change: 1 addition & 0 deletions samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ CONFIG_LOG_FRONTEND=y
CONFIG_LOG_FRONTEND_ONLY=y
CONFIG_LOG_FRONTEND_STMESP=y
CONFIG_LOG_FRONTEND_STMESP_FSC=y
CONFIG_DEBUG_DRIVER=y

CONFIG_UART_ASYNC_API=y
7 changes: 2 additions & 5 deletions samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
status = "okay";
};

&tddconf {
&coresight {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE | NRF_TDDCONF_SOURCE_STMPPR |
NRF_TDDCONF_SOURCE_STMFLPR)>;
portconfig = <0>;
etrbuffer = <&etr_buffer>;
mode = "stm-etr";
};
6 changes: 0 additions & 6 deletions samples/benchmarks/coremark/boards/nrf54h20dk_nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,3 @@
&uart135 {
status = "disabled";
};

/* DTS nodes required for the STM standalone logging, imported from the nordic-log-stm snippet. */
&tddconf {
status = "okay";
etrsources = <(NRF_TDDCONF_SOURCE_STMMAINCORE)>;
};
8 changes: 4 additions & 4 deletions samples/benchmarks/coremark/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/misc/coresight/nrf_etr.h>
#include <zephyr/drivers/debug/debug_nrf_etr.h>
#include <system_nrf.h>

#include "coremark_zephyr.h"
Expand Down Expand Up @@ -55,7 +55,7 @@ static atomic_t coremark_in_progress;

static void logging_mode_multi_domain_blocked_state_indicate(void)
{
if (!IS_ENABLED(CONFIG_NRF_ETR)) {
if (!IS_ENABLED(CONFIG_DEBUG_NRF_ETR)) {
return;
}

Expand All @@ -70,7 +70,7 @@ static void logging_mode_multi_domain_blocked_state_indicate(void)
k_sleep(K_MSEC(100));

/* Flush logs from the ETR and direct them to UART. */
nrf_etr_flush();
debug_nrf_etr_flush();
}

static int logging_mode_indicate(void)
Expand All @@ -94,7 +94,7 @@ static int logging_mode_indicate(void)
/* Only the core responsible for moving the logs from the STM sink to UART
* indicates the logging mode.
*/
if (IS_ENABLED(CONFIG_NRF_ETR)) {
if (IS_ENABLED(CONFIG_DEBUG_NRF_ETR)) {
LOG_INF("Multi-domain logging mode");
LOG_INF("This core is used to output logs from all cores to terminal "
"over UART\n");
Expand Down
7 changes: 0 additions & 7 deletions scripts/quarantine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,6 @@
- [email protected]/nrf54h20/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-34187"

- scenarios:
- sample.benchmark.coremark.heap_memory
- sample.benchmark.coremark.multiple_threads
platforms:
- [email protected]/nrf54h20/cpuapp
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-31463"

- scenarios:
- sample.nrf7002_eb.thingy53.shell
platforms:
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: 1801e0bf52f9ba75868e09ef154c13047f606832
revision: 34f1aa346560cdbb528caea4d52188ebdeb81c4f
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down