From aa81f829ebae6548dd2eabf1ab88482e7a9f40fd Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Mon, 25 Mar 2024 09:50:59 +0100 Subject: [PATCH 1/3] [nrf fromtree] samples: bluetooth: hci_ipc: Add nrf54h20 DK board overlay There are required DTS entries to nable peripherals required for IPC communication between Radio and APP CPUs. Signed-off-by: Piotr Pryga (cherry picked from commit 73bdf622f14e847068b3db776dd5a373654e2f6a) --- .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay diff --git a/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay new file mode 100644 index 00000000000..02db7c39272 --- /dev/null +++ b/samples/bluetooth/hci_ipc/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -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"; +}; From c345ff574decbfabb67649dafafc9634b5648972 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Fri, 22 Mar 2024 10:12:13 +0100 Subject: [PATCH 2/3] [nrf fromtree] boards: nrf54h20: Fix storage partitions for setting subsytem There was missing storage partition that is required for setting subsytem. Add missing entries to board files. Signed-off-by: Piotr Pryga (cherry picked from commit 6f07cecc9529d44fac0b0adfe5313379719d7681) --- .../nrf54h20dk_nrf54h20-memory_map.dtsi | 14 ++++++++++++++ .../nrf54h20dk_nrf54h20_cpuapp.dts | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20-memory_map.dtsi index 6b6402eb90f..68c0d5cd990 100644 --- a/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20-memory_map.dtsi +++ b/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20-memory_map.dtsi @@ -181,4 +181,18 @@ reg = <0x126000 DT_SIZE_K(64)>; }; }; + + cpuapp_rw_partitions: cpuapp-rw-partitions { + compatible = "nordic,owned-partitions", "fixed-partitions"; + status = "disabled"; + perm-read; + perm-write; + perm-secure; + #address-cells = <1>; + #size-cells = <1>; + + storage_partition: partition@136000 { + reg = <0x136000 DT_SIZE_K(24)>; + }; + }; }; diff --git a/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20_cpuapp.dts index a8ea9fe730f..8c6512861e8 100644 --- a/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20_cpuapp.dts +++ b/boards/arm/nrf54h20dk_nrf54h20/nrf54h20dk_nrf54h20_cpuapp.dts @@ -130,6 +130,10 @@ status = "okay"; }; +&cpuapp_rw_partitions { + status = "okay"; +}; + &cpuppr_vpr { execution-memory = <&cpuppr_code_data>; source-memory = <&cpuppr_code_partition>; From 9990de9c186ff17848d7895ca187cd47a4ec31d8 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Fri, 22 Mar 2024 10:27:38 +0100 Subject: [PATCH 3/3] [nrf fromtree] board: nrf54h20dk: Add missing default BT related configs There are default configs that are provided by default for e.g. nRF5340dk to enable HCI IPC communication type for application domain and enable BT controller for radio domain. These configs were missing for nRF54h20 DK. Signed-off-by: Piotr Pryga (cherry picked from commit b0f9391aee393a9d1d28b0a603c8364560b75f99) --- boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig b/boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig index 1a029338775..c0e83e0f6a8 100644 --- a/boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig +++ b/boards/arm/nrf54h20dk_nrf54h20/Kconfig.defconfig @@ -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