Skip to content

Commit 881608e

Browse files
edersondisouzanordicjm
authored andcommitted
boot/zephyr: Use MCUBOOT_RAM_LOAD instead of CONFIG_BOOT_RAM_LOAD
This will encompass both CONFIG_BOOT_RAM_LOAD and CONFIG_SINGLE_APPLICATION_SLOT_RAM_LOAD, which, at this point, should follow the same code path - load image to RAM. Signed-off-by: Ederson de Souza <ederson.desouza@intel.com>
1 parent 993c2ff commit 881608e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

boot/zephyr/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void do_boot(struct boot_rsp *rsp)
154154
* consecutively. Manually set the stack pointer and jump into the
155155
* reset vector
156156
*/
157-
#ifdef CONFIG_BOOT_RAM_LOAD
157+
#ifdef MCUBOOT_RAM_LOAD
158158
/* Get ram address for image */
159159
vt = (struct arm_vector_table *)(rsp->br_hdr->ih_load_addr + rsp->br_hdr->ih_hdr_size);
160160
#else
@@ -576,7 +576,7 @@ int main(void)
576576
FIH_PANIC;
577577
}
578578

579-
#ifdef CONFIG_BOOT_RAM_LOAD
579+
#ifdef MCUBOOT_RAM_LOAD
580580
BOOT_LOG_INF("Bootloader chainload address offset: 0x%x",
581581
rsp.br_hdr->ih_load_addr);
582582
#else

0 commit comments

Comments
 (0)