commit c48e7f917e17806cf34f592b2ba360c0df82944f
author Szymon Janc <szymon.janc@codecoup.pl> Tue Jul 03 16:37:14 2018 +0200
committer Carles Cufí <carles.cufi@nordicsemi.no> Tue Jul 03 17:46:33 2018 +0200
tree 6819a131f9fda034ea006a2443e63272551d2066
parent c1693d66bf9802233251d61d5539ef4d10679f77

boot_serial: Fix build on Zephyr with ECDSA enabled

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>

boot/boot_serial/CMakeLists.txt

diff --git a/boot/boot_serial/CMakeLists.txt b/boot/boot_serial/CMakeLists.txt
deleted file mode 100644
index 77665a7..0000000
--- a/boot/boot_serial/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(src)
-zephyr_include_directories(include)

boot/boot_serial/src/CMakeLists.txt

diff --git a/boot/boot_serial/src/CMakeLists.txt b/boot/boot_serial/src/CMakeLists.txt
deleted file mode 100644
index 20feaa1..0000000
--- a/boot/boot_serial/src/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-zephyr_sources(boot_serial.c)
-
-zephyr_include_directories(${BOOT_DIR}/bootutil/include)
-
-zephyr_link_libraries_ifdef(CONFIG_TINYCBOR TINYCBOR)

boot/zephyr/CMakeLists.txt

diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index 4ce1a8b..d63762b 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -128,8 +128,12 @@
 
 if (CONFIG_MCUBOOT_SERIAL)
 zephyr_sources(${BOOT_DIR}/zephyr/serial_adapter.c)
+zephyr_sources(${BOOT_DIR}/boot_serial/src/boot_serial.c)
 
-add_subdirectory(${BOOT_DIR}/boot_serial ./boot/boot_serial)
+zephyr_include_directories(${BOOT_DIR}/bootutil/include)
+zephyr_include_directories(${BOOT_DIR}/boot_serial/include)
+zephyr_include_directories(include)
+zephyr_link_libraries_ifdef(CONFIG_TINYCBOR TINYCBOR)
 endif()
 
 if(NOT CONFIG_BOOT_SIGNATURE_KEY_FILE STREQUAL "")