Skip to content
Closed
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 @@ -101,8 +101,8 @@
status = "okay";
reg = <0x2f010000 DT_SIZE_K(436)>;
ranges = <0x0 0x2f010000 0x6e000>;
cpuapp_data: memory@1000 {
reg = <0x1000 DT_SIZE_K(432)>;
cpuapp_data: memory@5000 {
reg = <0x1000 DT_SIZE_K(416)>;
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
status = "okay";
reg = <0x2f010000 DT_SIZE_K(512)>;
ranges = <0x0 0x2f010000 0x6e000>;
cpuapp_data: memory@1000 {
reg = <0x1000 DT_SIZE_K(508)>;
cpuapp_data: memory@5000 {
reg = <0x1000 DT_SIZE_K(492)>;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
};

&cpuapp_data {
reg = <0x1000 0x90000>;
reg = <0x5000 0x8c000>;
};

&can120 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
};

&cpuapp_data {
reg = <0x1000 0x20000>;
reg = <0x5000 0x1c000>;
};

&can120 {
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 65acb953582beb2ceaba8e4e458df019c245f74f
revision: pull/1817/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down