From 50015fb2d453e8023b191fb6f80f5d06f34ba1db Mon Sep 17 00:00:00 2001
From: Andrey Tolstoy <avtolstoy@gmail.com>
Date: Thu, 20 Jun 2024 02:09:52 +0700
Subject: [PATCH] bump system module version to 6101 (6.1.1)

---
 CHANGELOG.md                            | 6 ++++++
 build/release.sh                        | 2 +-
 build/version.mk                        | 4 ++--
 modules/shared/system_module_version.mk | 8 ++++----
 system/inc/system_version.h             | 4 +++-
 system/system-versions.md               | 1 +
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a7dcf1e7a..ec8556bc24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 6.1.1
+
+### FEATURES
+
+-  Allow temporarily disabling device protection [#2770](https://github.com/particle-iot/device-os/pull/2770)
+
 ## 6.1.0
 
 ### FEATURES
diff --git a/build/release.sh b/build/release.sh
index bfec861927..f5e407a497 100755
--- a/build/release.sh
+++ b/build/release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o errexit -o pipefail -o noclobber -o nounset
 
-VERSION=${VERSION:="6.1.0"}
+VERSION=${VERSION:="6.1.1"}
 
 function display_help ()
 {
diff --git a/build/version.mk b/build/version.mk
index 05f25f94b8..2e5ed64f17 100755
--- a/build/version.mk
+++ b/build/version.mk
@@ -1,7 +1,7 @@
-VERSION_STRING = 6.1.0
+VERSION_STRING = 6.1.1
 
 # PRODUCT_FIRMWARE_VERSION reported by default
 # FIXME: Unclear if this is used, PRODUCT_FIRMWARE_VERSION defaults to 65535 every release
-VERSION = 6100
+VERSION = 6101
 
 CFLAGS += -DSYSTEM_VERSION_STRING=$(VERSION_STRING)
diff --git a/modules/shared/system_module_version.mk b/modules/shared/system_module_version.mk
index 38f541dd3f..99fa0e95e5 100644
--- a/modules/shared/system_module_version.mk
+++ b/modules/shared/system_module_version.mk
@@ -1,6 +1,6 @@
 # Skip to next 100 every v0.x.0 release (e.g. 108 for v0.6.2 to 200 for v0.7.0-rc.1)
 # Bump by 1 for every prerelease or release with the same v0.x.* base.
-COMMON_MODULE_VERSION ?= 6100
+COMMON_MODULE_VERSION ?= 6101
 SYSTEM_PART1_MODULE_VERSION ?= $(COMMON_MODULE_VERSION)
 
 RELEASE_080_MODULE_VERSION_BASE ?= 300
@@ -14,7 +14,7 @@ USER_PART_MODULE_VERSION ?= 6
 # Skip to next 100 every v0.x.0 release (e.g. 11 for v0.6.2 to 100 for v0.7.0-rc.1),
 # but only if the bootloader has changed since the last v0.x.0 release.
 # Bump by 1 for every updated bootloader image for a release with the same v0.x.* base.
-BOOTLOADER_VERSION ?= 3000
+BOOTLOADER_VERSION ?= 3001
 
 ifeq ($(PLATFORM_MCU),rtl872x)
 PREBOOTLOADER_MBR_VERSION ?= 2
@@ -26,9 +26,9 @@ endif
 # this version usually lags behind the current bootloader version, to avoid non-mandatory updates.
 ifeq ($(PLATFORM_GEN),3)
 ifeq ($(PLATFORM_MCU),rtl872x)
-BOOTLOADER_DEPENDENCY = 3000
+BOOTLOADER_DEPENDENCY = 3001
 else # ifeq ($(PLATFORM_MCU),rtl872x)
-BOOTLOADER_DEPENDENCY = 3000
+BOOTLOADER_DEPENDENCY = 3001
 endif # ifeq ($(PLATFORM_GEN),3)
 else
 # Some sensible default
diff --git a/system/inc/system_version.h b/system/inc/system_version.h
index 946cd0c10f..09b95eddc8 100644
--- a/system/inc/system_version.h
+++ b/system/inc/system_version.h
@@ -218,7 +218,8 @@ extern "C" {
 #define SYSTEM_VERSION_v581         SYSTEM_VERSION_DEFAULT(5, 8, 1)
 #define SYSTEM_VERSION_v600         SYSTEM_VERSION_DEFAULT(6, 0, 0)
 #define SYSTEM_VERSION_v610         SYSTEM_VERSION_DEFAULT(6, 1, 0)
-#define SYSTEM_VERSION SYSTEM_VERSION_v610
+#define SYSTEM_VERSION_v611         SYSTEM_VERSION_DEFAULT(6, 1, 1)
+#define SYSTEM_VERSION SYSTEM_VERSION_v611
 
 /**
  * Previously we would set the least significant byte to 0 for the final release, but to make
@@ -401,6 +402,7 @@ extern "C" {
 #define SYSTEM_VERSION_581
 #define SYSTEM_VERSION_600
 #define SYSTEM_VERSION_610
+#define SYSTEM_VERSION_611
 
 typedef struct __attribute__((packed)) SystemVersionInfo
 {
diff --git a/system/system-versions.md b/system/system-versions.md
index 50d3e135c1..cac0c18e49 100644
--- a/system/system-versions.md
+++ b/system/system-versions.md
@@ -193,6 +193,7 @@
 | 2600 | 5801 | 5.8.1         |      Argon, Boron, B SoM, B5 SoM, Tracker, Tracker M, E Som X, M SoM, P2 |
 | 3000 | 6000 | 6.0.0         |      Argon, Boron, B SoM, B5 SoM, Tracker, Tracker M, E Som X, M SoM, P2 |
 | 3000 | 6100 | 6.1.0         |      Argon, Boron, B SoM, B5 SoM, Tracker, Tracker M, E Som X, M SoM, P2 |
+| 3001 | 6101 | 6.1.1         |      Argon, Boron, B SoM, B5 SoM, Tracker, E Som X |
 
 [1] For 0.8.0-rc.1, The v101 bootloader was also released in the Github releases as v200. Thus the next released bootloader in the 0.8.x line should be v201. As of 4/5/2018: 22 device had v200 bootloaders.