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
ext/lib/mgmt/mcumgr/cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
View file

@ -237,7 +237,7 @@ img_mgmt_impl_write_image_data(unsigned int offset, const void *data,
int int
img_mgmt_impl_swap_type(void) img_mgmt_impl_swap_type(void)
{ {
switch (boot_swap_type()) { switch (mcuboot_swap_type()) {
case BOOT_SWAP_TYPE_NONE: case BOOT_SWAP_TYPE_NONE:
return IMG_MGMT_SWAP_TYPE_NONE; return IMG_MGMT_SWAP_TYPE_NONE;
case BOOT_SWAP_TYPE_TEST: case BOOT_SWAP_TYPE_TEST:

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 * @return a BOOT_SWAP_TYPE_[...] constant on success, negative errno code on
* fail. * 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 * @brief Marks the image in slot 1 as pending. On the next reboot, the system

4
samples/subsys/usb/dfu/README.rst
View file

@ -86,7 +86,7 @@ showing this output to the console:
[MCUBOOT] [INF] boot_status_source: Image 0: magic=unset, copy_done=0xff, image_ok=0xff [MCUBOOT] [INF] boot_status_source: Image 0: magic=unset, copy_done=0xff, image_ok=0xff
[MCUBOOT] [INF] boot_status_source: Scratch: magic=unset, copy_done=0xe, image_ok=0xff [MCUBOOT] [INF] boot_status_source: Scratch: magic=unset, copy_done=0xe, image_ok=0xff
[MCUBOOT] [INF] boot_status_source: Boot source: slot 0 [MCUBOOT] [INF] boot_status_source: Boot source: slot 0
[MCUBOOT] [INF] boot_swap_type: Swap type: test [MCUBOOT] [INF] mcuboot_swap_type: Swap type: test
[MCUBOOT] [INF] main: Bootloader chainload address offset: 0x20000 [MCUBOOT] [INF] main: Bootloader chainload address offset: 0x20000
[MCUBOOT] [INF] main: Jumping to the first image slot0 [MCUBOOT] [INF] main: Jumping to the first image slot0
***** Booting Zephyr OS v1.11.0-830-g9df01813c4 ***** ***** Booting Zephyr OS v1.11.0-830-g9df01813c4 *****
@ -102,7 +102,7 @@ USB DFU sample, showing this output to the console:
[MCUBOOT] [INF] boot_status_source: Image 0: magic=good, copy_done=0x1, image_ok=0xff [MCUBOOT] [INF] boot_status_source: Image 0: magic=good, copy_done=0x1, image_ok=0xff
[MCUBOOT] [INF] boot_status_source: Scratch: magic=unset, copy_done=0xe, image_ok=0xff [MCUBOOT] [INF] boot_status_source: Scratch: magic=unset, copy_done=0xe, image_ok=0xff
[MCUBOOT] [INF] boot_status_source: Boot source: none [MCUBOOT] [INF] boot_status_source: Boot source: none
[MCUBOOT] [INF] boot_swap_type: Swap type: revert [MCUBOOT] [INF] mcuboot_swap_type: Swap type: revert
[MCUBOOT] [INF] main: Bootloader chainload address offset: 0x20000 [MCUBOOT] [INF] main: Bootloader chainload address offset: 0x20000
***** Booting Zephyr OS v1.11.0-830-g9df01813c4 ***** ***** Booting Zephyr OS v1.11.0-830-g9df01813c4 *****

2
subsys/dfu/boot/mcuboot.c
View file

@ -416,7 +416,7 @@ static int boot_read_swap_state(u8_t bank_id, struct boot_swap_state *state)
return 0; return 0;
} }
int boot_swap_type(void) int mcuboot_swap_type(void)
{ {
const struct boot_swap_table *table; const struct boot_swap_table *table;
struct boot_swap_state state_slot0; struct boot_swap_state state_slot0;