Preps for 2.1.0-rc1 release
Update release notes and version numbers for 2.1.0-rc1 release.
Signed-off-by: David Brown <david.brown@linaro.org>
diff --git a/README.md b/README.md
index 7211e22..9a7dafd 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
[travis]: https://travis-ci.org/mcu-tools/mcuboot
[license]: https://github.com/mcu-tools/mcuboot/blob/main/LICENSE
-This is MCUboot version 2.1.0-dev
+This is MCUboot version 2.1.0-rc1
MCUboot is a secure bootloader for 32-bits microcontrollers. It defines a
common infrastructure for the bootloader and the system flash layout on
diff --git a/docs/release-notes.d/boot-serial-echo.md b/docs/release-notes.d/boot-serial-echo.md
deleted file mode 100644
index 6116f05..0000000
--- a/docs/release-notes.d/boot-serial-echo.md
+++ /dev/null
@@ -1,4 +0,0 @@
-- Boot serial: Add response to echo command if support is not
- enabled, previously the command would have been accepted but no
- response indicating that the command is not supported would have
- been sent.
diff --git a/docs/release-notes.d/bootutil-builtin-keys.md b/docs/release-notes.d/bootutil-builtin-keys.md
deleted file mode 100644
index d86918b..0000000
--- a/docs/release-notes.d/bootutil-builtin-keys.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Added support for using builtin keys for image validation
- (available with the PSA Crypto API based crypto backend for ECDSA signatures).
diff --git a/docs/release-notes.d/bootutil-check-tlv.md b/docs/release-notes.d/bootutil-check-tlv.md
deleted file mode 100644
index 1cfdb98..0000000
--- a/docs/release-notes.d/bootutil-check-tlv.md
+++ /dev/null
@@ -1,2 +0,0 @@
-- Enforce that TLV entries that should be protected are.
- This can be disabled by defining `ALLOW_ROGUE_TLVS`
diff --git a/docs/release-notes.d/bootutil-sector.md b/docs/release-notes.d/bootutil-sector.md
deleted file mode 100644
index be1186d..0000000
--- a/docs/release-notes.d/bootutil-sector.md
+++ /dev/null
@@ -1,7 +0,0 @@
-- bootutil: Fixed issue with comparing sector sizes for
- compatibility, this now also checks against the number of usable
- sectors (which is the slot size minus the swap status and moved
- up by one sector).
-- bootutil: Added debug logging to show write location of swap status
- and details on sectors including if slot sizes are not optimal for
- a given board.
diff --git a/docs/release-notes.d/ptest.md b/docs/release-notes.d/ptest.md
deleted file mode 100644
index caca800..0000000
--- a/docs/release-notes.d/ptest.md
+++ /dev/null
@@ -1,8 +0,0 @@
-- Update ptest to support test selection. Ptest can now be invoked with `list`
- to show the available tests and `run` to run them. The `-t` argument will
- select specific tests to run.
-- Allow sim tests to skip slow tests. By setting `MCUBOOT_SKIP_SLOW_TESTS` in
- the environment, the sim will skip two tests that are very slow. In one
- instance this reduces the test time from 2 hours to about 5 minutes. These
- slow tests are useful, in that they test bad powerdown recovery, but are
- inconvenient when testing other areas.
diff --git a/docs/release-notes.d/zephyr-cache.md b/docs/release-notes.d/zephyr-cache.md
deleted file mode 100644
index 72cc01b..0000000
--- a/docs/release-notes.d/zephyr-cache.md
+++ /dev/null
@@ -1,4 +0,0 @@
-- Zephyr: Fixes support for disabling instruction/data caches prior
- to chain-loading an application, this will be automatically
- enabled if one or both of these caches are present. This feature
- can be disabled by setting `CONFIG_BOOT_DISABLE_CACHES` to `n`.
diff --git a/docs/release-notes.d/zephyr-encryption-single.md b/docs/release-notes.d/zephyr-encryption-single.md
deleted file mode 100644
index 78767db..0000000
--- a/docs/release-notes.d/zephyr-encryption-single.md
+++ /dev/null
@@ -1,3 +0,0 @@
-- Zephyr: Fix issue with single application slot mode, serial
- recovery and encryption whereby an encrypted image is loaded
- and being wrongly treated as encrypted after decryption.
diff --git a/docs/release-notes.d/zephyr-estimated-sysbuild.mc b/docs/release-notes.d/zephyr-estimated-sysbuild.mc
deleted file mode 100644
index 8b42c26..0000000
--- a/docs/release-notes.d/zephyr-estimated-sysbuild.mc
+++ /dev/null
@@ -1 +0,0 @@
-- Zephyr: Add estimated image footer size to cache in sysbuild.
diff --git a/docs/release-notes.d/zephyr-firmware-loader.md b/docs/release-notes.d/zephyr-firmware-loader.md
deleted file mode 100644
index 8f6acf4..0000000
--- a/docs/release-notes.d/zephyr-firmware-loader.md
+++ /dev/null
@@ -1,4 +0,0 @@
-- Added firmware loader configuration type support for Zephyr, this
- allows for a single application slot and firmware loader image in
- the secondary slot which is used to update the primary image
- (loading it in any way it sees fit e.g. via Bluetooth).
diff --git a/docs/release-notes.d/zephyr-mass-erase.md b/docs/release-notes.d/zephyr-mass-erase.md
deleted file mode 100644
index 7834ee2..0000000
--- a/docs/release-notes.d/zephyr-mass-erase.md
+++ /dev/null
@@ -1 +0,0 @@
-- Zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE Kconfig option.
diff --git a/docs/release-notes.d/zephyr-mbedtls-kconfig.md b/docs/release-notes.d/zephyr-mbedtls-kconfig.md
deleted file mode 100644
index d7914cb..0000000
--- a/docs/release-notes.d/zephyr-mbedtls-kconfig.md
+++ /dev/null
@@ -1 +0,0 @@
-- Zephyr: Prevent MBEDTLS Kconfig selection when tinycrypt is used.
diff --git a/docs/release-notes.d/zephyr-usb.md b/docs/release-notes.d/zephyr-usb.md
deleted file mode 100644
index 139de7c..0000000
--- a/docs/release-notes.d/zephyr-usb.md
+++ /dev/null
@@ -1,7 +0,0 @@
-- Zephyr: Add USB CDC serial recovery check that now causes a build
- failure if console is enabled and device is the same as the USB
- CDC device.
-- Zephyr: Add USB CDC serial recovery check that now causes a build
- failure if the main thread priority is below 0 (cooperative
- thread), this would prevent USB CDC from working as the driver
- would not have been able to fire callbacks.
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 45b32e6..662f3ff 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -3,6 +3,53 @@
- Table of Contents
{:toc}
+## Version 2.1.0
+
+- Boot serial: Add response to echo command if support is not
+ enabled, previously the command would have been accepted but no
+ response indicating that the command is not supported would have
+ been sent.
+- Added support for using builtin keys for image validation
+ (available with the PSA Crypto API based crypto backend for ECDSA signatures).
+- Enforce that TLV entries that should be protected are.
+ This can be disabled by defining `ALLOW_ROGUE_TLVS`
+- bootutil: Fixed issue with comparing sector sizes for
+ compatibility, this now also checks against the number of usable
+ sectors (which is the slot size minus the swap status and moved
+ up by one sector).
+- bootutil: Added debug logging to show write location of swap status
+ and details on sectors including if slot sizes are not optimal for
+ a given board.
+- Update ptest to support test selection. Ptest can now be invoked with `list`
+ to show the available tests and `run` to run them. The `-t` argument will
+ select specific tests to run.
+- Allow sim tests to skip slow tests. By setting `MCUBOOT_SKIP_SLOW_TESTS` in
+ the environment, the sim will skip two tests that are very slow. In one
+ instance this reduces the test time from 2 hours to about 5 minutes. These
+ slow tests are useful, in that they test bad powerdown recovery, but are
+ inconvenient when testing other areas.
+- Zephyr: Fixes support for disabling instruction/data caches prior
+ to chain-loading an application, this will be automatically
+ enabled if one or both of these caches are present. This feature
+ can be disabled by setting `CONFIG_BOOT_DISABLE_CACHES` to `n`.
+- Zephyr: Fix issue with single application slot mode, serial
+ recovery and encryption whereby an encrypted image is loaded
+ and being wrongly treated as encrypted after decryption.
+- Zephyr: Add estimated image footer size to cache in sysbuild.
+- Added firmware loader configuration type support for Zephyr, this
+ allows for a single application slot and firmware loader image in
+ the secondary slot which is used to update the primary image
+ (loading it in any way it sees fit e.g. via Bluetooth).
+- Zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE Kconfig option.
+- Zephyr: Prevent MBEDTLS Kconfig selection when tinycrypt is used.
+- Zephyr: Add USB CDC serial recovery check that now causes a build
+ failure if console is enabled and device is the same as the USB
+ CDC device.
+- Zephyr: Add USB CDC serial recovery check that now causes a build
+ failure if the main thread priority is below 0 (cooperative
+ thread), this would prevent USB CDC from working as the driver
+ would not have been able to fire callbacks.
+
## Version 2.0.0
Note that this release, 2.0.0 is a new major number, and contains a small API
diff --git a/repository.yml b/repository.yml
index fab3830..731757f 100644
--- a/repository.yml
+++ b/repository.yml
@@ -37,6 +37,7 @@
"1.9.0": "v1.9.0"
"1.10.0": "v1.10.0"
"2.0.0": "v2.0.0"
+ "2.1.0": "v2.1.0-rc1"
"0-dev": "0.0.0" # main
"0-latest": "2.0.0" # latest stable release
diff --git a/scripts/imgtool/__init__.py b/scripts/imgtool/__init__.py
index 249e23c..0b415ad 100644
--- a/scripts/imgtool/__init__.py
+++ b/scripts/imgtool/__init__.py
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-imgtool_version = "2.0.0"
+imgtool_version = "2.1.0rc1"