samples: use project cofing for subimages

Remove kconfig.root for child images
Left prj.conf with configuration

Signed-off-by: Krzysztof Taborowski <[email protected]>

samples/sid_end_device/CMakeLists.txt

@@ -9,10 +9,6 @@ cmake_minimum_required(VERSION 3.20.0)
 # Sidewalk version
 include(bootloader_version.cmake)
 
-# Child images
-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)
-
 # Zephyr CMake project
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(sidewalk_sid_end_device)

samples/sid_end_device/child_image/hci_ipc/prj _release.conf

@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+# Bluetooth
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=n
+CONFIG_BT_MAX_CONN=1
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_HCI_RAW_RESERVE=1
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
+# IPC
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+# Debug
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+CONFIG_ASSERT=y
+CONFIG_DEBUG_INFO=y
+CONFIG_RESET_ON_FATAL_ERROR=y

samples/sid_end_device/child_image/hci_ipc/prj.conf

@@ -1,8 +1,36 @@
 #
-# Copyright (c) 2021 Nordic Semiconductor ASA
+# Copyright (c) 2024 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
-CONFIG_LOG=n
-CONFIG_SERIAL=n
+CONFIG_HEAP_MEM_POOL_SIZE=8192
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+
+# Bluetooth
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=n
+CONFIG_BT_MAX_CONN=1
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=251
+CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_CTLR_ASSERT_HANDLER=y
+CONFIG_BT_HCI_RAW=y
+CONFIG_BT_HCI_RAW_RESERVE=1
+
+# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
+# Host number of completed commands does not follow normal flow control.
+CONFIG_BT_BUF_CMD_TX_COUNT=10
+
+# IPC
+CONFIG_IPC_SERVICE=y
+CONFIG_MBOX=y
+
+# Debug
+CONFIG_LOG=y
+CONFIG_SERIAL=y
+CONFIG_EXCEPTION_STACK_TRACE=y
+CONFIG_ASSERT=y
+CONFIG_DEBUG_INFO=y
 CONFIG_RESET_ON_FATAL_ERROR=n

samples/sid_end_device/child_image/mcuboot/prj.conf

@@ -1,25 +1,36 @@
 #
-# Copyright (c) 2021 Nordic Semiconductor ASA
+# Copyright (c) 2024 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
+CONFIG_MAIN_STACK_SIZE=10240
+
+CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
+CONFIG_BOOT_BOOTSTRAP=n
+CONFIG_PM=n
+
+CONFIG_FLASH=y
+CONFIG_FPROTECT=y
+
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
-CONFIG_BOOT_ENCRYPT_IMAGE=n
-CONFIG_CBPRINTF_NANO=y
+CONFIG_BOOT_MAX_IMG_SECTORS=256
 
-CONFIG_BOOT_UPGRADE_ONLY=n
-CONFIG_RESET_ON_FATAL_ERROR=y
+# Use minimal C library instead of the Picolib
+CONFIG_MINIMAL_LIBC=y
 
-CONFIG_LOG=n
-CONFIG_PRINTK=n
-CONFIG_CONSOLE_HANDLER=n
-CONFIG_ASSERT=n
-CONFIG_BOOT_BANNER=n
+# Bootloader size optimization
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-CONFIG_NO_RUNTIME_CHECKS=y
-CONFIG_SIZE_OPTIMIZATIONS=y
+CONFIG_LOG=n
+CONFIG_CONSOLE_HANDLER=n
+CONFIG_BOOT_BANNER=n
+CONFIG_TIMESLICING=n
+CONFIG_RESET_ON_FATAL_ERROR=n
+CONFIG_MULTITHREADING=n
+CONFIG_TICKLESS_KERNEL=n
+CONFIG_TIMEOUT_64BIT=n
+CONFIG_NRF_ENABLE_ICACHE=n

samples/sid_end_device/child_image/mcuboot/prj_release.conf

@@ -1,25 +1,36 @@
 #
-# Copyright (c) 2021 Nordic Semiconductor ASA
+# Copyright (c) 2024 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
+CONFIG_MAIN_STACK_SIZE=10240
+
+CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
+CONFIG_BOOT_BOOTSTRAP=n
+CONFIG_PM=n
+
+CONFIG_FLASH=y
+CONFIG_FPROTECT=y
+
 CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
-CONFIG_BOOT_ENCRYPT_IMAGE=n
-CONFIG_CBPRINTF_NANO=y
+CONFIG_BOOT_MAX_IMG_SECTORS=256
 
-CONFIG_BOOT_UPGRADE_ONLY=n
-CONFIG_RESET_ON_FATAL_ERROR=y
+# Use minimal C library instead of the Picolib
+CONFIG_MINIMAL_LIBC=y
 
-CONFIG_LOG=n
-CONFIG_PRINTK=n
-CONFIG_CONSOLE_HANDLER=n
-CONFIG_ASSERT=n
-CONFIG_BOOT_BANNER=n
+# Bootloader size optimization
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_GPIO=n
-CONFIG_NO_RUNTIME_CHECKS=y
-CONFIG_SIZE_OPTIMIZATIONS=y
+CONFIG_LOG=n
+CONFIG_CONSOLE_HANDLER=n
+CONFIG_BOOT_BANNER=n
+CONFIG_TIMESLICING=n
+CONFIG_RESET_ON_FATAL_ERROR=n
+CONFIG_MULTITHREADING=n
+CONFIG_TICKLESS_KERNEL=n
+CONFIG_TIMEOUT_64BIT=n
+CONFIG_NRF_ENABLE_ICACHE=n