fixup! sys/riotboot: riotboot head v2

Author: fabian18

core/lib/init.c

@@ -31,6 +31,7 @@
 #include "thread.h"
 #include "stdio_base.h"
 #if IS_USED(MODULE_RIOTBOOT)
+#  include "riotboot/slot.h"
 #  include "riotboot/wdt.h"
 #endif
 #if IS_USED(MODULE_VFS)
@@ -63,8 +64,11 @@ static void *main_trampoline(void *arg)
     }
 
 #if IS_USED(MODULE_RIOTBOOT)
-    if (IS_USED(MODULE_RIOTBOOT_HDR_MAIN_CONFIRM)) {
-        riotboot_wdt_stop();
+    if (IS_USED(MODULE_RIOTBOOT_HDR_AUTO_CONFIRM)) {
+        riotboot_slot_confirm();
+        if (IS_USED(MODULE_RIOTBOOT_WDT)) {
+            riotboot_wdt_stop();
+        }
     }
 #endif
     int res = main();

sys/include/riotboot/slot.h

@@ -119,6 +119,15 @@ size_t riotboot_slot_offset(unsigned slot);
  */
 void riotboot_slot_dump_addrs(void);
 
+/**
+ * @brief   Confirm the currently running image slot
+ *
+ * This function sets the image state to CONFIRMED in the header of the
+ * currently running image, if it is in ACTIVATED state.
+ * It must be called manually if not module `riotboot_hdr_auto_confirm` is used.
+ */
+void riotboot_slot_confirm(void);
+
 /**
  * @brief  Get the size of a slot
  *

sys/riotboot/Makefile.dep

@@ -37,3 +37,7 @@ endif
 ifneq (,$(filter riotboot_tinyusb_dfu, $(USEMODULE)))
   USEPKG += tinyusb
 endif
+
+# should be explicitly disabled
+DEFAULT_MODULE += riotboot_hdr_auto_activate
+DEFAULT_MODULE += riotboot_hdr_auto_confirm

sys/riotboot/Makefile.include

@@ -34,6 +34,3 @@ PSEUDOMODULES += riotboot_hdr_v2
 PSEUDOMODULES += riotboot_hdr_auto_activate
 # Confirm image on first boot once main is reached
 PSEUDOMODULES += riotboot_hdr_auto_confirm
-# should be explicitly disabled
-DEFAULT_MODULE += riotboot_hdr_auto_activate
-DEFAULT_MODULE += riotboot_hdr_auto_confirm

sys/riotboot/slot.c

@@ -28,6 +28,9 @@
 
 #include "container.h"
 #include "cpu.h"
+#ifdef MODULE_PERIPH_FLASHPAGE
+#  include "periph/flashpage.h"
+#endif
 #include "riotboot/slot.h"
 #include "riotboot/hdr.h"
 
@@ -103,3 +106,18 @@ size_t riotboot_slot_offset(unsigned slot)
 {
     return (size_t)riotboot_slot_get_hdr(slot) - CPU_FLASH_BASE;
 }
+
+void riotboot_slot_confirm(void)
+{
+    int slot = riotboot_slot_current();
+    riotboot_hdr_t riot_hdr = *riotboot_slot_get_hdr(slot);
+    if (riotboot_hdr_is_v2(&riot_hdr)) {
+        riotboot_hdr_set_img_state(&riot_hdr, RIOTBOOT_HDR_IMG_STATE_CONFIRMED);
+        if (memcmp(&riot_hdr, riotboot_slot_get_hdr(slot), sizeof(riot_hdr.v2))) {
+#ifdef MODULE_PERIPH_FLASHPAGE
+            flashpage_write(flashpage_addr(flashpage_page(riotboot_slot_get_hdr(slot))),
+                            &riot_hdr.v2, sizeof(riot_hdr.v2));
+#endif
+        }
+    }
+}