Skip to content

boot: zephyr: Allow disabling default multiple RAM region file #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

boot: zephyr: Allow disabling default multiple RAM region file #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boot/zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ if((CONFIG_BOOT_SWAP_USING_SCRATCH OR CONFIG_BOOT_SWAP_USING_MOVE OR CONFIG_BOOT
zephyr_library_sources(flash_check.c)
endif()

if(CONFIG_BOOT_RAM_LOAD)
if(CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS_DEFAULT_FILE)
zephyr_library_sources(ram_load.c)
endif()

Expand Down
10 changes: 10 additions & 0 deletions boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,16 @@ config MULTIPLE_EXECUTABLE_RAM_REGIONS
When selected, boot_get_image_exec_ram_info() should be updated to provide
the information about the areas.

config MULTIPLE_EXECUTABLE_RAM_REGIONS_DEFAULT_FILE
bool "Default MCUboot multiple executable RAM region source file"
default y
depends on MULTIPLE_EXECUTABLE_RAM_REGIONS
help
When enabled, will include the default MCUboot file that has the
boot_get_image_exec_ram_info() implementation in it, for users with out-of-tree or
custom configuration then this option can be disabled and a custom file can be added
by a CMake module which defines the configuration for the intended board.

config FLASH_RUNTIME_SOURCES
bool "Images are read from flash partitions defined at runtime"
depends on SINGLE_APPLICATION_SLOT
Expand Down
3 changes: 0 additions & 3 deletions boot/zephyr/ram_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,14 @@

#include <zephyr/devicetree.h>

#ifdef MULTIPLE_EXECUTABLE_RAM_REGIONS
int boot_get_image_exec_ram_info(uint32_t image_id,
uint32_t *exec_ram_start,
uint32_t *exec_ram_size)
{

#ifdef CONFIG_SOC_SERIES_STM32N6X
*exec_ram_start = DT_PROP_BY_IDX(DT_NODELABEL(axisram1), reg, 0);
*exec_ram_size = DT_PROP_BY_IDX(DT_NODELABEL(axisram1), reg, 1);
#endif

return 0;
}
#endif /* MULTIPLE_EXECUTABLE_RAM_REGIONS */
Loading