From fb4f8a8435015aaa91ee8c34e7c6265c4dcda150 Mon Sep 17 00:00:00 2001 From: Sarah Renkhoff Date: Tue, 30 Jan 2024 11:56:49 +0100 Subject: [PATCH] ubxlib: Reflect upstream changes to builds Signed-off-by: Sarah Renkhoff --- modules/ubxlib/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/ubxlib/CMakeLists.txt b/modules/ubxlib/CMakeLists.txt index 079680256e..f498b892ab 100644 --- a/modules/ubxlib/CMakeLists.txt +++ b/modules/ubxlib/CMakeLists.txt @@ -59,6 +59,9 @@ endif() # CONFIG_UBXLIB_GEODESIC # The actual library we're building zephyr_library_named(ubxlib) +# Extra modules +list(APPEND ZEPHYR_EXTRA_MODULES ${UBXLIB_BASE}/drivers) + # Include paths that should be exposed to applications ("UBXLIB_INC") zephyr_include_directories( ${UBXLIB_BASE} @@ -122,12 +125,6 @@ target_include_directories(ubxlib PRIVATE ${ZEPHYR_BASE}/include ) -# Hacking this in directly for now, ultimately -# we don't want the mbedtls dependency anyway! -target_include_directories(ubxlib PRIVATE - ${ZEPHYR_BASE}/../modules/crypto/mbedtls/include -) - # Unconditional sources add_src_dir(${UBXLIB_BASE}/common/assert/src) add_src_dir(${UBXLIB_BASE}/common/at_client/src) @@ -162,7 +159,6 @@ list(APPEND UBXLIB_SRC ${UBXLIB_BASE}/common/network/src/u_network_private_gnss_stub.c ${UBXLIB_BASE}/common/network/src/u_network_private_wifi_stub.c ${UBXLIB_BASE}/port/clib/u_port_clib_mktime64.c - ${UBXLIB_BASE}/port/platform/common/mbedtls/u_port_crypto.c ${UBXLIB_BASE}/port/u_port_heap.c ${UBXLIB_BASE}/port/u_port_timezone.c ${UBXLIB_BASE}/port/u_port_resource.c @@ -173,6 +169,8 @@ list(APPEND UBXLIB_SRC ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_uart.c ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_i2c.c ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_spi.c + ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_ppp.c + ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_board_cfg.c ${UBXLIB_BASE}/port/platform/zephyr/src/u_port_private.c )