diff --git a/CHANGELOG.md b/CHANGELOG.md index 89d36bb..9d4a4db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v1.2.0] - Unreleased +## [v1.2.0] - 2024-05-14 ### Changed -- Merged Reference Design template_v2.1.0 +- Merge changes from + [`golioth/reference-design-template@template_v2.1.0`](https://github.com/golioth/reference-design-template/tree/template_v2.1.0). ## [v1.1.0] - 2023-09-22 diff --git a/prj.conf b/prj.conf index deab389..e1bfda7 100644 --- a/prj.conf +++ b/prj.conf @@ -65,4 +65,4 @@ CONFIG_NEWLIB_LIBC=y CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y # Firmware version used in DFU process -CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.1.0" +CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION="1.2.0"