From c3bc9481e2286f7bc09d1df701c43d8c04ec03ca Mon Sep 17 00:00:00 2001 From: parag-silabs <111579455+parag-silabs@users.noreply.github.com> Date: Mon, 17 Oct 2022 21:56:18 -0400 Subject: [PATCH] [cmake] disable `OPENTHREAD_CONFIG_NCP_HDLC_ENABLE` when `OT_NCP_SPI` is set (#8282) --- src/lib/spinel/CMakeLists.txt | 10 ++++++++-- src/ncp/radio.cmake | 12 ++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/spinel/CMakeLists.txt b/src/lib/spinel/CMakeLists.txt index 5c01ec30c..a2019efc5 100644 --- a/src/lib/spinel/CMakeLists.txt +++ b/src/lib/spinel/CMakeLists.txt @@ -31,13 +31,19 @@ add_library(openthread-spinel-rcp) target_compile_definitions(openthread-spinel-ncp PRIVATE OPENTHREAD_FTD=1 - OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 PUBLIC OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE=1 ) +if (OT_NCP_SPI) + target_compile_definitions(openthread-spinel-ncp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=0) + target_compile_definitions(openthread-spinel-rcp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=0) +else() + target_compile_definitions(openthread-spinel-ncp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1) + target_compile_definitions(openthread-spinel-rcp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1) +endif() + target_compile_definitions(openthread-spinel-rcp PRIVATE OPENTHREAD_RADIO=1 - OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 PUBLIC OPENTHREAD_SPINEL_CONFIG_OPENTHREAD_MESSAGE_ENABLE=0 ) diff --git a/src/ncp/radio.cmake b/src/ncp/radio.cmake index 3b3122f48..1350a28e8 100644 --- a/src/ncp/radio.cmake +++ b/src/ncp/radio.cmake @@ -31,9 +31,14 @@ add_library(openthread-rcp) target_compile_definitions(openthread-rcp PRIVATE OPENTHREAD_RADIO=1 OPENTHREAD_RADIO_CLI=0 - OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1 ) +if (OT_NCP_SPI) + target_compile_definitions(openthread-rcp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=0) +else() + target_compile_definitions(openthread-rcp PRIVATE OPENTHREAD_CONFIG_NCP_HDLC_ENABLE=1) +endif() + target_compile_options(openthread-rcp PRIVATE ${OT_CFLAGS} ) @@ -47,8 +52,11 @@ target_link_libraries(openthread-rcp PUBLIC openthread-radio PRIVATE - openthread-hdlc openthread-spinel-rcp ot-config-radio ot-config ) + +if(NOT OT_NCP_SPI) + target_link_libraries(openthread-rcp PRIVATE openthread-hdlc) +endif()