Commit e1173afe authored by Daniel DeGrasse's avatar Daniel DeGrasse Committed by Fabio Baltieri
Browse files

dfu: mcuboot: update dependencies for RAMLOAD_WITH_REVERT 



Much like in RAMLOAD mode, RAMLOAD_WITH_REVERT requires that mcuboot
subsystem fetch bootloader information via the retention subsystem.

Signed-off-by: default avatarDaniel DeGrasse <ddegrasse@tenstorrent.com>
parent aa0ff3cf

subsys/dfu/boot/mcuboot.c

+13 −5
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
#include "bootutil/bootutil_public.h"

#include <zephyr/dfu/mcuboot.h>



#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)

#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD) || \

	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD_WITH_REVERT)

/* For RAM LOAD mode, the active image must be fetched from the bootloader */

#include <bootutil/boot_status.h>

#include <zephyr/retention/blinfo.h>

#endif
@@ -49,7 +51,8 @@ enum IMAGE_INDEXES { 
	IMAGE_INDEX_2

};



#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)

#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD) || \

	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD_WITH_REVERT)

/* For RAM LOAD mode, the active image must be fetched from the bootloader */

#define ACTIVE_SLOT_FLASH_AREA_ID boot_fetch_active_slot()

#define INVALID_SLOT_ID 255
@@ -81,7 +84,8 @@ struct mcuboot_v1_raw_header { 
 * End of strict defines

 */



#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD)

#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD) || \

	defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD_WITH_REVERT)

uint8_t boot_fetch_active_slot(void)

{

	int rc;
@@ -99,12 +103,16 @@ uint8_t boot_fetch_active_slot(void) 


	return slot;

}

#else  /* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD */

#else  /* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD ||

	* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD_WITH_REVERT

	*/

uint8_t boot_fetch_active_slot(void)

{

	return ACTIVE_SLOT_FLASH_AREA_ID;

}

#endif /* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD */

#endif /* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD ||

	* CONFIG_MCUBOOT_BOOTLOADER_MODE_RAM_LOAD_WITH_REVERT

	*/



#if defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_OFFSET)

size_t boot_get_image_start_offset(uint8_t area_id)

CRA Git | Maintained and supported by SUSTech CRA and CCSE