From 01b445a0fb85147d7e3dad0aea3a75c00107144e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Sat, 10 Apr 2021 22:35:30 +0200 Subject: [PATCH] Update linked list library and include it into build --- stm-firmware/CMakeLists.txt | 4 ++-- stm-firmware/linklist-lib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stm-firmware/CMakeLists.txt b/stm-firmware/CMakeLists.txt index 54336b7..37ccb9b 100644 --- a/stm-firmware/CMakeLists.txt +++ b/stm-firmware/CMakeLists.txt @@ -74,7 +74,7 @@ if (UART_ON_DEBUG_HEADER) endif (UART_ON_DEBUG_HEADER) add_subdirectory(base64-lib) - +add_subdirectory(linklist-lib) aux_source_directory("." MAIN_SOURCES) aux_source_directory("config-parser" CFG_PARSER_SRCS) @@ -98,7 +98,7 @@ add_dependencies(${ELFFILE} updater-ram-code-header-blob) target_include_directories(${ELFFILE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/shellmatta/api ${CMAKE_CURRENT_SOURCE_DIR}/config-parser/include) target_link_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles -T${LINKER_SCRIPT} -Wl,--print-memory-usage) -target_link_libraries(${ELFFILE} base64-lib) +target_link_libraries(${ELFFILE} base64-lib linklist-lib) target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updater/ram-code/include/") set(HEX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${HEXFILE}") diff --git a/stm-firmware/linklist-lib b/stm-firmware/linklist-lib index 77a6a86..18b3ab3 160000 --- a/stm-firmware/linklist-lib +++ b/stm-firmware/linklist-lib @@ -1 +1 @@ -Subproject commit 77a6a862348f9dfb4b28576857fb3cda0705ec40 +Subproject commit 18b3ab377ac30516f977e9831813ea37189d4028