Commit 032eb725 authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

mergeup: merge up to upstream 9b48d08d 

Synchronize up to:
https://github.com/JuulLabs-OSS/mcuboot/commit/9b48d08dfc28742e4bd390ce6f981aa5e470df55



Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 60cc5686 9b48d08d

README.md

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
[coverity]: https://scan.coverity.com/projects/mcuboot

[travis]: https://travis-ci.org/JuulLabs-OSS/mcuboot



This is mcuboot version 1.6.0-rc2

This is mcuboot version 1.6.0



MCUboot is a secure bootloader for 32-bit MCUs. The goal of MCUboot is to

define a common infrastructure for the bootloader, system flash layout on
@@ -25,6 +25,7 @@ Instructions for different operating systems can be found here: 
- [Zephyr](docs/readme-zephyr.md)

- [Mynewt](docs/readme-mynewt.md)

- [RIOT](docs/readme-riot.md)

- [Simulator](sim/README.rst)



## Roadmap

boot/boot_serial/src/boot_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ boot_serial_start(const struct boot_uart_funcs *f) 
{

    int rc;

    int off;

    int dec_off;

    int dec_off = 0;

    int full_line;

    int max_input;

boot/boot_serial/src/serial_recovery.cddl

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ Member = ("image" => int) / 
	("sha" => bstr)



Upload = {

	3**5members: Member

	1**5members: Member

}

boot/boot_serial/src/serial_recovery_cbor.c

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */



/* Generated with cddl_gen.py (https://github.com/oyvindronningstad/cddl_gen)

 * at: 2020-02-26 10:33:34

 * at: 2020-05-13 12:19:04

 */



#include <stdint.h>
@@ -58,8 +58,8 @@ static bool decode_Upload( 
	size_t *p_temp_elem_count = temp_elem_counts;

	Upload_t* p_type_result = (Upload_t*)p_result;



	bool result = (((list_start_decode(p_state, &(*(p_temp_elem_count++)), 3, 5))

	&& multi_decode(3, 5, &(*p_type_result)._Upload_members_count, (void*)decode_Member, p_state, &((*p_type_result)._Upload_members), NULL, NULL, sizeof(_Member_t))

	bool result = (((list_start_decode(p_state, &(*(p_temp_elem_count++)), 1, 5))

	&& multi_decode(1, 5, &(*p_type_result)._Upload_members_count, (void*)decode_Member, p_state, &((*p_type_result)._Upload_members), NULL, NULL, sizeof(_Member_t))

	&& ((p_state->elem_count = *(--p_temp_elem_count)) || 1)));



	if (!result)

boot/boot_serial/src/serial_recovery_cbor.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */



/* Generated with cddl_gen.py (https://github.com/oyvindronningstad/cddl_gen)

 * at: 2020-02-26 10:33:34

 * at: 2020-05-13 12:19:04

 */



#ifndef SERIAL_RECOVERY_CBOR_H__

CRA Git | Maintained and supported by SUSTech CRA and CCSE