[nrf noup] bootutil: Use boot_state_init/clear in loader manifest

de-nordic · de-nordic · commit 894ec54d9329 · 2025-12-19T15:29:40.000Z
Now boot_state_init is used for state initialization
and boot_state_clear to clean it after it is no longer need.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/loader_manifest_xip.c b/boot/bootutil/src/loader_manifest_xip.c
@@ -646,9 +646,12 @@ boot_go(struct boot_rsp *rsp)
 {
     FIH_DECLARE(fih_rc, FIH_FAILURE);
 
-    boot_state_clear(NULL);
+    boot_state_init(&boot_data);
 
     FIH_CALL(context_boot_go, fih_rc, &boot_data, rsp);
+
+    boot_state_clear(&boot_data);
+
     FIH_RET(fih_rc);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -646,9 +646,12 @@ boot_go(struct boot_rsp *rsp)`
`646`	`646`	`{`
`647`	`647`	`FIH_DECLARE(fih_rc, FIH_FAILURE);`
`648`	`648`
`649`		`- boot_state_clear(NULL);`
	`649`	`+ boot_state_init(&boot_data);`
`650`	`650`
`651`	`651`	`FIH_CALL(context_boot_go, fih_rc, &boot_data, rsp);`
	`652`	`+`
	`653`	`+ boot_state_clear(&boot_data);`
	`654`	`+`
`652`	`655`	`FIH_RET(fih_rc);`
`653`	`656`	`}`
`654`	`657`