DEBUG: test scenario for confirm image after an OTA - THIS COMMIT WILL BE DELETED

Signed-off-by: Almir Okato <almir.okato@espressif.com>

Author: almir-okato

samples/subsys/mgmt/mcumgr/smp_svr/boards/esp32s3_devkitm_procpu.overlay

@@ -0,0 +1,4 @@
+&flash0 {
+       write-block-size = <32>;
+};
+

samples/subsys/mgmt/mcumgr/smp_svr/overlay-bt.conf

@@ -14,7 +14,7 @@ CONFIG_MCUMGR_TRANSPORT_BT_CONN_PARAM_CONTROL=y
 # Enable the Shell mcumgr transport.
 CONFIG_BASE64=y
 CONFIG_CRC=y
-CONFIG_SHELL=y
+# CONFIG_SHELL=y
 CONFIG_SHELL_BACKEND_SERIAL=y
 CONFIG_MCUMGR_TRANSPORT_SHELL=y
 

samples/subsys/mgmt/mcumgr/smp_svr/prj.conf

@@ -8,7 +8,7 @@ CONFIG_FLASH_MAP=y
 
 # Some command handlers require a large stack.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
-CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_MAIN_STACK_SIZE=8192
 
 # Ensure an MCUboot-compatible binary is generated.
 CONFIG_BOOTLOADER_MCUBOOT=y
@@ -35,7 +35,15 @@ CONFIG_MCUMGR_GRP_STAT=y
 
 # Enable logging
 CONFIG_LOG=y
-CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y
+CONFIG_MCUBOOT_UTIL_LOG_LEVEL_INF=y
+CONFIG_LOG_MODE_IMMEDIATE=y
+# CONFIG_LOG_BUFFER_SIZE=4096
 
 # Disable debug logging
 CONFIG_LOG_MAX_LEVEL=3
+
+CONFIG_REBOOT=y
+
+# Ensure asset is aligned and padded correctly for flash encryption.
+CONFIG_MCUBOOT_EXTRA_IMGTOOL_ARGS="--align 32 --max-align 32 --pad --pad-sig"
+CONFIG_MCUBOOT_GENERATE_CONFIRMED_IMAGE=y

samples/subsys/mgmt/mcumgr/smp_svr/src/main.c

@@ -8,6 +8,7 @@
 #include <zephyr/kernel.h>
 #include <zephyr/stats/stats.h>
 #include <zephyr/usb/usb_device.h>
+#include <zephyr/dfu/mcuboot.h>
 
 #ifdef CONFIG_MCUMGR_GRP_FS
 #include <zephyr/device.h>
@@ -18,8 +19,14 @@
 #include <zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h>
 #endif
 
+#include <zephyr/sys/reboot.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 #define LOG_LEVEL LOG_LEVEL_DBG
 #include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+
 LOG_MODULE_REGISTER(smp_sample);
 
 #include "common.h"
@@ -50,6 +57,42 @@ static struct fs_mount_t littlefs_mnt = {
 };
 #endif
 
+int latch_ota_if_required()
+{
+	// boot_request_upgrade(false);
+
+	// LOG_PANIC();
+	// k_sleep(K_SECONDS(2));
+	// sys_reboot(SYS_REBOOT_COLD);
+
+	LOG_INF("latch_ota_if_required");
+
+	if (boot_is_img_confirmed()) {
+		LOG_INF("No update is currently being tested");
+		return 0;
+	}
+
+	LOG_INF("latch_ota_if_required 2");
+
+	int ret = boot_write_img_confirmed();
+	if (ret) {
+		LOG_ERR("Current image is being tested, but failed to confirm! Rollback imminent!"
+			"(err %d)",
+			ret);
+		return ret;
+	}
+
+	LOG_INF("boot_write_img_confirmed() appears to have been successful");
+
+	if (boot_is_img_confirmed()) {
+		LOG_INF("boot_write_img_confirmed worked");
+	} else {
+		LOG_ERR("boot_write_img_confirmed did not work -- this shouldn't happen");
+	}
+
+	return 0;
+}
+
 int main(void)
 {
 	int rc = STATS_INIT_AND_REG(smp_svr_stats, STATS_SIZE_32,
@@ -85,6 +128,8 @@ int main(void)
 	 */
 	LOG_INF("build time: " __DATE__ " " __TIME__);
 
+	latch_ota_if_required();
+
 	/* The system work queue handles all incoming mcumgr requests.  Let the
 	 * main thread idle while the mcumgr server runs.
 	 */