Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions boot/zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -541,10 +541,6 @@ if((CONFIG_BOOT_SWAP_USING_SCRATCH OR CONFIG_BOOT_SWAP_USING_MOVE OR CONFIG_BOOT
zephyr_sources(flash_check.c)
endif()

if(CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS_DEFAULT_FILE)
zephyr_sources(ram_load.c)
endif()

if(SYSBUILD)
if(CONFIG_SINGLE_APPLICATION_SLOT OR CONFIG_BOOT_FIRMWARE_LOADER OR CONFIG_BOOT_SWAP_USING_SCRATCH OR CONFIG_BOOT_SWAP_USING_MOVE OR CONFIG_BOOT_SWAP_USING_OFFSET OR CONFIG_BOOT_UPGRADE_ONLY OR CONFIG_BOOT_DIRECT_XIP OR CONFIG_BOOT_RAM_LOAD)
# TODO: RAM LOAD support
Expand Down
10 changes: 0 additions & 10 deletions boot/zephyr/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -748,16 +748,6 @@ 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

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there deprecation concerns, as this was default y?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only 1 device made use of this file, which has been migrated to dts and was only in one MCUboot (and zephyr) release

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
32 changes: 0 additions & 32 deletions boot/zephyr/ram_load.c

This file was deleted.

2 changes: 0 additions & 2 deletions boot/zephyr/socs/stm32n657xx_fsbl.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
CONFIG_STM32_MEMMAP=y

CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS=y
12 changes: 7 additions & 5 deletions docs/release-notes.d/zephyr-ram-load.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
- Zephyr RAM load mode now uses a `mcuboot,image-ram` chosen
devicetree node to specify the RAM region to load the image
into.
- Manually setting the `BOOT_IMAGE_EXECUTABLE_RAM_START` and
`BOOT_IMAGE_EXECUTABLE_RAM_SIZE` Kconfigs is now deprecated.
- Zephyr RAM load mode now uses a `mcuboot,image-ram` chosen
devicetree node to specify the RAM region to load the image
into.
- Manually setting the `BOOT_IMAGE_EXECUTABLE_RAM_START` and
`BOOT_IMAGE_EXECUTABLE_RAM_SIZE` Kconfigs is now deprecated.
- `CONFIG_MULTIPLE_EXECUTABLE_RAM_REGIONS_DEFAULT_FILE` has been
removed as this configuration is now done using devicetree.
Loading