zephyr: Remove scratch from flash_area_id_from_multi_image_slot

de-nordic · nordicjm · commit 06747985eee7 · 2025-01-20T08:26:09.000Z
The mapping does not seem to be needed as scratch is opened directly,
and there is only one for all images anyway.
Simulator seems to error out when asked to identify scratch with
this function.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/zephyr/flash_map_extended.c b/boot/zephyr/flash_map_extended.c
@@ -62,9 +62,6 @@ int flash_area_id_from_multi_image_slot(int image_index, int slot)
     case 0: return FLASH_AREA_IMAGE_PRIMARY(image_index);
 #if !defined(CONFIG_SINGLE_APPLICATION_SLOT)
     case 1: return FLASH_AREA_IMAGE_SECONDARY(image_index);
-#endif
-#if defined(CONFIG_BOOT_SWAP_USING_SCRATCH)
-    case 2: return FLASH_AREA_IMAGE_SCRATCH;
 #endif
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,6 @@ int flash_area_id_from_multi_image_slot(int image_index, int slot)`
`62`	`62`	`case 0: return FLASH_AREA_IMAGE_PRIMARY(image_index);`
`63`	`63`	`#if !defined(CONFIG_SINGLE_APPLICATION_SLOT)`
`64`	`64`	`case 1: return FLASH_AREA_IMAGE_SECONDARY(image_index);`
`65`		`-#endif`
`66`		`-#if defined(CONFIG_BOOT_SWAP_USING_SCRATCH)`
`67`		`- case 2: return FLASH_AREA_IMAGE_SCRATCH;`
`68`	`65`	`#endif`
`69`	`66`	`}`
`70`	`67`