cmake: sysbuild: fast_pair: add support for nRF54H20 non-PM

Adds support for generating fast pair data for nRF54H20 which
does not use partition manager

Signed-off-by: Kamil Piszczek <[email protected]>
Signed-off-by: Jamie McCrae <[email protected]>

Author: kapi-no

cmake/sysbuild/fast_pair_hex.cmake

@@ -1,10 +1,10 @@
 #
-# Copyright (c) 2022-2023 Nordic Semiconductor
+# Copyright (c) 2022-2024 Nordic Semiconductor
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-function(fast_pair_hex)
+function(fast_pair_hex_pm)
   set(fp_partition_name bt_fast_pair)
 
   set(
@@ -47,4 +47,76 @@ function(fast_pair_hex)
     )
 endfunction()
 
-fast_pair_hex()
+function(fast_pair_hex_dts)
+  include(${CMAKE_CURRENT_LIST_DIR}/suit_utilities.cmake)
+
+  if(NOT SB_CONFIG_SOC_SERIES_NRF54HX)
+    message(FATAL_ERROR "Fast Pair data provisioning using DTS partitions is only supported"
+                        "for nRF54H series.")
+  endif()
+
+  set(fp_partition_name bt_fast_pair_partition)
+
+  sysbuild_dt_nodelabel(
+    bt_fast_pair_partition_nodelabel
+    IMAGE
+    ${DEFAULT_IMAGE}
+    NODELABEL
+    "${fp_partition_name}"
+    )
+  sysbuild_dt_reg_addr(
+    bt_fast_pair_partition_relative_address
+    IMAGE
+    ${DEFAULT_IMAGE}
+    PATH
+    "${bt_fast_pair_partition_nodelabel}"
+    )
+
+  # This part assumes that the Fast Pair partition resides in MRAM1x.
+  # TODO: Rewrite it to be more generic and support other memory regions.
+  sysbuild_dt_nodelabel(mram1x_nodelabel IMAGE ${DEFAULT_IMAGE} NODELABEL "mram1x")
+  sysbuild_dt_reg_addr(mram1x_address IMAGE ${DEFAULT_IMAGE} PATH "${mram1x_nodelabel}")
+
+  math(
+    EXPR
+    bt_fast_pair_partition_address
+    "${mram1x_address} + ${bt_fast_pair_partition_relative_address}"
+    OUTPUT_FORMAT
+    HEXADECIMAL)
+
+  set(
+    fp_provisioning_data_hex
+    ${CMAKE_BINARY_DIR}/modules/nrf/subsys/bluetooth/services/fast_pair/fp_provisioning_data.hex
+    )
+
+  set(fp_provisioning_data_address ${bt_fast_pair_partition_address})
+
+  add_custom_command(
+    OUTPUT
+    ${fp_provisioning_data_hex}
+    COMMAND
+    ${PYTHON_EXECUTABLE} ${ZEPHYR_NRF_MODULE_DIR}/scripts/nrf_provision/fast_pair/fp_provision_cli.py
+                         -o ${fp_provisioning_data_hex} -a ${fp_provisioning_data_address}
+                         -m ${FP_MODEL_ID} -k ${FP_ANTI_SPOOFING_KEY}
+    COMMENT
+    "Generating Fast Pair provisioning data hex file"
+    USES_TERMINAL
+    )
+
+  add_custom_target(
+    ${fp_partition_name}_target
+    ALL
+    DEPENDS
+    "${fp_provisioning_data_hex}"
+    )
+
+  suit_add_merge_hex_file(FILES ${fp_provisioning_data_hex}
+                          DEPENDENCIES ${fp_partition_name}_target
+  )
+endfunction()
+
+if(SB_CONFIG_PARTITION_MANAGER)
+  fast_pair_hex_pm()
+else()
+  fast_pair_hex_dts()
+endif()

subsys/bluetooth/services/fast_pair/Kconfig.fast_pair

@@ -131,7 +131,7 @@ endif # BT_FAST_PAIR_GATT_SERVICE
 config BT_FAST_PAIR_REGISTRATION_DATA
 	bool
 	default y
-	select PM_SINGLE_IMAGE
+	select PM_SINGLE_IMAGE if !(SOC_SERIES_NRF54HX)
 	help
 	  Add Fast Pair registration data source files.
 

subsys/bluetooth/services/fast_pair/fp_registration_data.c

@@ -8,7 +8,6 @@
 #include <string.h>
 #include <zephyr/device.h>
 #include <zephyr/storage/flash_map.h>
-#include <pm_config.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(fast_pair, CONFIG_BT_FAST_PAIR_LOG_LEVEL);
@@ -18,8 +17,14 @@ LOG_MODULE_DECLARE(fast_pair, CONFIG_BT_FAST_PAIR_LOG_LEVEL);
 #include "fp_crypto.h"
 #include "fp_registration_data.h"
 
+#if defined(CONFIG_PARTITION_MANAGER_ENABLED)
+#include <pm_config.h>
 #define FP_PARTITION_ID		PM_BT_FAST_PAIR_ID
 #define FP_PARTITION_SIZE	PM_BT_FAST_PAIR_SIZE
+#else
+#define FP_PARTITION_ID		FIXED_PARTITION_ID(bt_fast_pair_partition)
+#define FP_PARTITION_SIZE	FIXED_PARTITION_SIZE(bt_fast_pair_partition)
+#endif
 
 static const uint8_t fp_magic[] = {0xFA, 0x57, 0xFA, 0x57};
 

sysbuild/CMakeLists.txt

@@ -498,7 +498,10 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
     set_config_bool(${DEFAULT_IMAGE} CONFIG_BT_FAST_PAIR y)
 
     if(DEFINED FP_MODEL_ID AND DEFINED FP_ANTI_SPOOFING_KEY)
-      include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair_hex.cmake)
+      if(SB_CONFIG_PARTITION_MANAGER)
+        include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair_hex.cmake)
+      endif()
+
       set(FP_DATA_PRESENT "y" CACHE INTERNAL "Fast Pair provisioning data provided" FORCE)
     else()
       message(WARNING "Fast Pair support is enabled but `FP_MODEL_ID` or `FP_ANTI_SPOOFING_KEY` were not provided, this is likely to cause a build error")
@@ -613,6 +616,11 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake)
 
   set_property(GLOBAL PROPERTY DOMAIN_APP_APP ${DEFAULT_IMAGE})
 
+  # Include any files that need to merge files with uicr_merged.hex before including suit
+  if(FP_DATA_PRESENT AND NOT SB_CONFIG_PARTITION_MANAGER)
+    include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/fast_pair_hex.cmake)
+  endif()
+
   include_packaging()
   include_suit()