Commit db6ba462 authored by Jamie McCrae's avatar Jamie McCrae Committed by Jamie
Browse files

boot_serial: Unify zcbor include paths 



Moves zcbor files to a subdirectory and replaces differing
include path styles to be unified.

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent 7a4b1926

boot/boot_serial/pkg.yml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ pkg.deps: 
    - "@apache-mynewt-core/encoding/base64"

    - "@mcuboot/boot/mynewt/flash_map_backend"

    - "@mcuboot/boot/mynewt/boot_uart"

    - "@mcuboot/boot/zcbor"

    - "@apache-mynewt-core/util/crc"



pkg.req_apis:

boot/boot_serial/src/serial_recovery_cbor.c

+0 −5
Original line number Diff line number Diff line
@@ -15,12 +15,7 @@ 
#include <stdbool.h>

#include <stddef.h>

#include <string.h>



#ifdef __ZEPHYR__

#include <zcbor_decode.h>

#else

#include "zcbor_decode.h"

#endif



#include "serial_recovery_cbor.h"

boot/boot_serial/src/serial_recovery_cbor.h

+0 −5
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ 
#include <stdbool.h>

#include <stddef.h>

#include <string.h>



#ifdef __ZEPHYR__

#include <zcbor_decode.h>

#else

#include "zcbor_decode.h"

#endif



#include "serial_recovery_cbor_types.h"

boot/boot_serial/src/serial_recovery_cbor_types.h

+0 −5
Original line number Diff line number Diff line
@@ -18,12 +18,7 @@ 
#include <stdbool.h>

#include <stddef.h>

#include <string.h>



#ifdef __ZEPHYR__

#include <zcbor_decode.h>

#else

#include "zcbor_decode.h"

#endif



#ifdef __cplusplus

extern "C" {

boot/boot_serial/src/serial_recovery_echo.c

+0 −5
Original line number Diff line number Diff line
@@ -8,12 +8,7 @@ 
#include <stdbool.h>

#include <stddef.h>

#include <string.h>



#ifdef __ZEPHYR__

#include <zcbor_decode.h>

#else

#include "zcbor_decode.h"

#endif



#include "serial_recovery_echo.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE