commit f7d8660e854b7f43787654490281c27b6c232334
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Fri Apr 14 09:33:42 2023 +0100
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Mon Apr 24 11:34:28 2023 +0200
tree 6bb2bbd3900af98dd6784a4ababa1689b0852519
parent c7835371a0df4366c9e1a22dfb43161ef50ec938

boot_serial: Fix include paths for zephyr builds

Fixes include paths for zephyr builds to use the system zcbor_*
files rather than the local files.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index a05c816..e8afbfe 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -26,7 +26,6 @@
 #include "sysflash/sysflash.h"
 
 #include "bootutil/bootutil_log.h"
-#include "zcbor_encode.h"
 
 #ifdef __ZEPHYR__
 #include <zephyr/sys/reboot.h>
@@ -37,13 +36,16 @@
 #include <zephyr/sys/crc.h>
 #include <zephyr/sys/base64.h>
 #include <hal/hal_flash.h>
+#include <zcbor_encode.h>
 #elif __ESPRESSIF__
+#include "zcbor_encode.h"
 #include <bootloader_utility.h>
 #include <esp_rom_sys.h>
 #include <esp_crc.h>
 #include <endian.h>
 #include <mbedtls/base64.h>
 #else
+#include "zcbor_encode.h"
 #include <bsp/bsp.h>
 #include <hal/hal_system.h>
 #include <hal/hal_flash.h>