Commit 5657d00e authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski
Browse files

mergeup: merge up to upstream 82c5f7c6 

Synchronize up to

https://github.com/JuulLabs-OSS/mcuboot/commit/82c5f7


which is same as v1.6.0-rc2 tag.

Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parents 48b8ef0a 82c5f7c6

.travis.yml

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ matrix: 
      go:

        - "1.12"



    - os: linux

      language: python

      env: TEST=imgtool



before_install:

  - |

    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then

README.md

+1 −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.5.0

This is mcuboot version 1.6.0-rc2



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

boot/bootutil/include/bootutil/bench.h

+2 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: Apache-2.0

 *

 * Copyright (c) 2019 Linaro Limited

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

boot/bootutil/include/bootutil/bootutil.h

+8 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: Apache-2.0

 *

 * Copyright (c) 2017-2019 Linaro LTD

 * Copyright (c) 2016-2019 JUUL Labs

 * Copyright (c) 2019 Arm Limited

 *

 * Original license:

 *

 * Licensed to the Apache Software Foundation (ASF) under one

 * or more contributor license agreements.  See the NOTICE file

 * distributed with this work for additional information

boot/bootutil/include/bootutil/bootutil_log.h

+2 −0
Original line number Diff line number Diff line 
/*

 * SPDX-License-Identifier: Apache-2.0

 *

 * Copyright (c) 2017 Linaro Limited

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

CRA Git | Maintained and supported by SUSTech CRA and CCSE