Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
reg = <0xa5000 DT_SIZE_K(72)>;
};

/delete-node/ partition@94000;
cpuapp_slot0_partition: partition@b7000 {
reg = <0xb7000 DT_SIZE_K(256)>;
};
Expand All @@ -32,6 +33,8 @@
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RXS>;
#address-cells = < 0x1 >;
#size-cells = < 0x1 >;

/delete-node/ partition@54000;
cpurad_slot0_partition: partition@66000 {
reg = < 0x66000 DT_SIZE_K(160) >;
};
Expand Down
12 changes: 6 additions & 6 deletions scripts/quarantine_zephyr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,6 @@
- native_sim
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-30877"

- scenarios:
- drivers.spi.pm_runtime
platforms:
- nrf52840dk/nrf52840
comment: "TBD"

# --------------------------------- Won't fix section -----------------------------------

- scenarios:
Expand Down Expand Up @@ -451,3 +445,9 @@
- platforms:
- native_posix
comment: "native_posix will be removed soon - native_sim platform is the default simulator now"

- scenarios:
- drivers.hwinfo.api
platforms:
- nrf54h20dk/nrf54h20/cpuppr
comment: Unsupported device
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: b6535f5caeff11a44b2daf808b2ddaddcf5ba4d3
revision: 36a1e64bc8414029324cb4e8a4828c13c170f3fc
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading