diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 09246ef2e..000000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,56 +0,0 @@ -if(CONFIG_MBEDTLS) -zephyr_interface_library_named(mbedTLS) - -if(CONFIG_MBEDTLS_BUILTIN) - target_compile_definitions(mbedTLS INTERFACE - MBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CFG_FILE}" - ) - - target_include_directories(mbedTLS INTERFACE - include - configs - ) - - zephyr_library() - - file(GLOB - mbedtls_sources # This is an output parameter - library/*.c - ) - - zephyr_library_sources( - zephyr_init.c - ${mbedtls_sources} - ) - - zephyr_library_app_memory(k_mbedtls_partition) -if(CONFIG_ARCH_POSIX AND CONFIG_ASAN AND NOT CONFIG_64BIT) - # i386 assembly code used in MBEDTLS does not compile with size optimization - # if address sanitizer is enabled, as such switch default optimization level - # to speed - set_property(SOURCE library/bignum.c APPEND PROPERTY COMPILE_OPTIONS - "${OPTIMIZE_FOR_SPEED_FLAG}") -endif () - - zephyr_library_link_libraries(mbedTLS) -else() - assert(CONFIG_MBEDTLS_LIBRARY "MBEDTLS was enabled, but neither BUILTIN or LIBRARY was selected.") - - # NB: CONFIG_MBEDTLS_LIBRARY is not regression tested and is - # therefore susceptible to bit rot - - target_include_directories(mbedTLS INTERFACE - ${CONFIG_MBEDTLS_INSTALL_PATH} - ) - - zephyr_link_libraries( - mbedtls_external - -L${CONFIG_MBEDTLS_INSTALL_PATH} - gcc - ) - # Lib mbedtls_external depends on libgcc (I assume?) so to allow - # mbedtls_external to link with gcc we need to ensure it is placed - # after mbedtls_external on the linkers command line. -endif() - -endif() diff --git a/zephyr/module.yml b/zephyr/module.yml index eb317c3ce..ab1e2b0f6 100644 --- a/zephyr/module.yml +++ b/zephyr/module.yml @@ -1,2 +1,3 @@ build: - cmake: . + cmake-ext: True + kconfig-ext: True diff --git a/zephyr_init.c b/zephyr_init.c deleted file mode 100644 index ecd9fe428..000000000 --- a/zephyr_init.c +++ /dev/null @@ -1,52 +0,0 @@ -/** @file - * @brief mbed TLS initialization - * - * Initialize the mbed TLS library like setup the heap etc. - */ - -/* - * Copyright (c) 2017 Intel Corporation - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include -#include - -#if defined(CONFIG_MBEDTLS) -#if !defined(CONFIG_MBEDTLS_CFG_FILE) -#include "mbedtls/config.h" -#else -#include CONFIG_MBEDTLS_CFG_FILE -#endif /* CONFIG_MBEDTLS_CFG_FILE */ -#endif - -#if defined(CONFIG_MBEDTLS_ENABLE_HEAP) && \ - defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) -#include - -#if !defined(CONFIG_MBEDTLS_HEAP_SIZE) -#error "Please set heap size to be used. Set value to CONFIG_MBEDTLS_HEAP_SIZE \ -option." -#endif - -static unsigned char _mbedtls_heap[CONFIG_MBEDTLS_HEAP_SIZE]; - -static void init_heap(void) -{ - mbedtls_memory_buffer_alloc_init(_mbedtls_heap, sizeof(_mbedtls_heap)); -} -#else -#define init_heap(...) -#endif /* CONFIG_MBEDTLS_ENABLE_HEAP && MBEDTLS_MEMORY_BUFFER_ALLOC_C */ - -static int _mbedtls_init(const struct device *device) -{ - ARG_UNUSED(device); - - init_heap(); - - return 0; -} - -SYS_INIT(_mbedtls_init, POST_KERNEL, 0);