From f7b59d26db4cc55c6936a0a88f3daa7e0b7b2085 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Wed, 21 Aug 2024 15:06:20 +0200 Subject: [PATCH] samples: openthread: Do not use Partition Manager on nRF52 dongle Partition Manager is redundant on nRF52840 dongle while sysbuild is in use. Signed-off-by: Arkadiusz Balys --- samples/openthread/cli/Kconfig.sysbuild | 6 +++++- samples/openthread/cli/src/main.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/samples/openthread/cli/Kconfig.sysbuild b/samples/openthread/cli/Kconfig.sysbuild index ddb8b87e5383..f9a156939b4d 100644 --- a/samples/openthread/cli/Kconfig.sysbuild +++ b/samples/openthread/cli/Kconfig.sysbuild @@ -4,7 +4,11 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" +# Do not use partition manager on nRF52840 dongle. +config PARTITION_MANAGER + default n if BOARD_NRF52840DONGLE_NRF52840 config NRF_DEFAULT_IPC_RADIO default y + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c index b97e28294d66..c169cbcefbcd 100644 --- a/samples/openthread/cli/src/main.c +++ b/samples/openthread/cli/src/main.c @@ -38,7 +38,7 @@ int main(void) uint32_t dtr = 0U; ret = usb_enable(NULL); - if (ret != 0) { + if (ret != 0 && ret != -EALREADY) { LOG_ERR("Failed to enable USB"); return 0; }