Samples: Use hci_ipc child_image instead of hci_rpmsg

When using hci_rpmsg, *.conf files for child_image were not taken into account. KRKNWK-18546 Signed-off-by: Tomasz Tyzenhauz <tomasz.tyzenhauz@nordicsemi.no>
nrfconnect · Mar 10, 2024 · 41ffbc4 · 41ffbc4
1 parent d5d1ce5
commit 41ffbc4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/samples/sid_end_device/CMakeLists.txt b/samples/sid_end_device/CMakeLists.txt
@@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.20.0)
 include(bootloader_version.cmake)
 
 # Child images
-set(hci_rpmsg_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/hci_rpmsg/Kconfig.root)
+set(hci_ipc_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/hci_ipc/Kconfig.root)
 set(mcuboot_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/mcuboot/Kconfig.root)
 
 # Configurations

diff --git a/...device/child_image/hci_rpmsg/Kconfig.root → ...d_device/child_image/hci_ipc/Kconfig.root b/...device/child_image/hci_rpmsg/Kconfig.root → ...d_device/child_image/hci_ipc/Kconfig.root
@@ -5,7 +5,7 @@
 #
 
 # The purpose of this file is to create a wrapper Kconfig file that will be set as
-# hci_rpmsg_KCONFIG_ROOT and processed before any other Kconfig for hci_rpmsg child image.
+# hci_ipc_KCONFIG_ROOT and processed before any other Kconfig for hci_ipc child image.
 
 config HEAP_MEM_POOL_SIZE
     default 8192

diff --git a/...end_device/child_image/hci_rpmsg/prj.conf → ...d_end_device/child_image/hci_ipc/prj.conf b/...end_device/child_image/hci_rpmsg/prj.conf → ...d_end_device/child_image/hci_ipc/prj.conf
diff --git a/...ice/child_image/hci_rpmsg/prj_no_dfu.conf → ...evice/child_image/hci_ipc/prj_no_dfu.conf b/...ice/child_image/hci_rpmsg/prj_no_dfu.conf → ...evice/child_image/hci_ipc/prj_no_dfu.conf
diff --git a/...ce/child_image/hci_rpmsg/prj_release.conf → ...vice/child_image/hci_ipc/prj_release.conf b/...ce/child_image/hci_rpmsg/prj_release.conf → ...vice/child_image/hci_ipc/prj_release.conf