Skip to content
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

Jump to bottom

Add missing configuration for Bluetooth, NFC and storage partition for settings #1596

Merged
merged 3 commits into from
Apr 5, 2024
Merged

Add missing configuration for Bluetooth, NFC and storage partition for settings #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa81f82
[nrf fromtree] samples: bluetooth: hci_ipc: Add nrf54h20 DK board ove…
ppryga-nordic Mar 25, 2024
c345ff5
[nrf fromtree] boards: nrf54h20: Fix storage partitions for setting s…
ppryga-nordic Mar 22, 2024
9990de9
[nrf fromtree] board: nrf54h20dk: Add missing default BT related configs
ppryga-nordic Mar 22, 2024
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
15 changes: 15 additions & 0 deletions boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,18 @@
config BOARD
default "nrf54h20dk_nrf54h20_cpuapp" if BOARD_NRF54H20DK_NRF54H20_CPUAPP
default "nrf54h20dk_nrf54h20_cpurad" if BOARD_NRF54H20DK_NRF54H20_CPURAD

if BOARD_NRF54H20DK_NRF54H20_CPUAPP

choice BT_HCI_BUS_TYPE
default BT_HCI_IPC if BT
endchoice

endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP

if BOARD_NRF54H20DK_NRF54H20_CPURAD

config BT_CTLR
default y if BT

endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
14 changes: 14 additions & 0 deletions boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20-memory_map.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,18 @@
reg = <0x126000 DT_SIZE_K(64)>;
};
};

cpuapp_rw_partitions: cpuapp-rw-partitions {
compatible = "nordic,owned-partitions", "fixed-partitions";
status = "disabled";
KAGA164 marked this conversation as resolved.
Show resolved Hide resolved
perm-read;
perm-write;
perm-secure;
#address-cells = <1>;
#size-cells = <1>;

storage_partition: partition@136000 {
reg = <0x136000 DT_SIZE_K(24)>;
};
};
};
4 changes: 4 additions & 0 deletions boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@
status = "okay";
};

&cpuapp_rw_partitions {
status = "okay";
};

&cpuppr_vpr {
execution-memory = <&cpuppr_code_data>;
source-memory = <&cpuppr_code_partition>;
Expand Down
27 changes: 27 additions & 0 deletions samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

/ {
chosen {
zephyr,bt-hci-ipc = &ipc0;
};
};

ipc0: &cpuapp_cpurad_ipc {
status = "okay";
};

&cpuapp_cpurad_ram0x_region {
status = "okay";
};

&cpurad_bellboard {
status = "okay";
};

&cpuapp_bellboard {
status = "okay";
};
Loading