michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dfu: mcuboot: rename boot_swap_type> mcuboot_swap_type

Browse source 
This function conflicts with a function of the same name in mcuboot.
This happens when building USB DFU support into mcuboot.

DFU over USB uses image manager and mcuboot internals to manage images
downloaded to the device.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-02-18 14:43:14 -05:00 • committed by Carles Cufí
commit 996c252e51
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/dfu/mcuboot.h
View file

@ -143,7 +143,7 @@ int boot_write_img_confirmed(void);
* @return a BOOT_SWAP_TYPE_[...] constant on success, negative errno code on
* fail.
*/
int boot_swap_type(void);
int mcuboot_swap_type(void);
/**
* @brief Marks the image in slot 1 as pending. On the next reboot, the system