mgmt: Add missing CONFIG_ prefixes

tomchy · jhedberg · commit 2e0d9ed2cf79 · 2025-09-30T15:29:33.000+03:00
Fix the incorrect usage of Kconfig symbols and revert back the default
behavior to allow for non-active slot confirmation.

Signed-off-by: Tomasz Chyrowicz &lt;tomasz.chyrowicz@nordicsemi.no&gt;
diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
@@ -685,7 +685,7 @@ int img_mgmt_set_next_boot_slot(int slot, bool confirm)
 	 * verified to actually be bootable, a new policy was introduced,
 	 * that applies to both active and inactive images.
 	 */
-#ifndef MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT
+#ifndef CONFIG_MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT
 	if (confirm && slot != active_slot) {
 		return IMG_MGMT_ERR_IMAGE_CONFIRMATION_DENIED;
 	}
@@ -751,7 +751,7 @@ int img_mgmt_set_next_boot_slot(int slot, bool confirm)
 		return IMG_MGMT_ERR_IMAGE_SETTING_TEST_TO_ACTIVE_DENIED;
 	}
 
-#ifndef MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT
+#ifndef CONFIG_MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT
 	if (slot != active_slot && confirm) {
 		return IMG_MGMT_ERR_IMAGE_CONFIRMATION_DENIED;
 	}

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ int img_mgmt_set_next_boot_slot(int slot, bool confirm)`
`685`	`685`	`* verified to actually be bootable, a new policy was introduced,`
`686`	`686`	`* that applies to both active and inactive images.`
`687`	`687`	`*/`
`688`		`-#ifndef MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT`
	`688`	`+#ifndef CONFIG_MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT`
`689`	`689`	`if (confirm && slot != active_slot) {`
`690`	`690`	`return IMG_MGMT_ERR_IMAGE_CONFIRMATION_DENIED;`
`691`	`691`	`}`
`@@ -751,7 +751,7 @@ int img_mgmt_set_next_boot_slot(int slot, bool confirm)`
`751`	`751`	`return IMG_MGMT_ERR_IMAGE_SETTING_TEST_TO_ACTIVE_DENIED;`
`752`	`752`	`}`
`753`	`753`
`754`		`-#ifndef MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT`
	`754`	`+#ifndef CONFIG_MCUMGR_GRP_IMG_ALLOW_CONFIRM_NON_ACTIVE_SLOT`
`755`	`755`	`if (slot != active_slot && confirm) {`
`756`	`756`	`return IMG_MGMT_ERR_IMAGE_CONFIRMATION_DENIED;`
`757`	`757`	`}`