Skip to content
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.

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

kconfig: Deprecate BOOTLOADER_SRAM_SIZE #65156

Merged
merged 3 commits into from
Jan 8, 2024
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
16 changes: 15 additions & 1 deletion Kconfig.zephyr
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ config IS_BOOTLOADER
a separate Zephyr image payload.

config BOOTLOADER_SRAM_SIZE
int "SRAM reserved for bootloader"
int "SRAM reserved for bootloader [DEPRECATED]"
default 0
depends on !XIP || IS_BOOTLOADER
depends on ARM || XTENSA
Expand All @@ -883,6 +883,20 @@ config BOOTLOADER_SRAM_SIZE
- Zephyr is a !XIP image, which implicitly assumes existence of a
bootloader that loads the Zephyr !XIP image onto SRAM.

This option is deprecated, users should transition to using DTS to set this, if needed.
To be removed after Zephyr 3.7 release.

config BOOTLOADER_SRAM_SIZE_DEPRECATED
bool
default y
select DEPRECATED
depends on BOOTLOADER_SRAM_SIZE != 0
depends on !XIP || IS_BOOTLOADER
depends on ARM || XTENSA
help
Non-prompt symbol to indicate that the deprecated BOOTLOADER_SRAM_SIZE Kconfig has a
non-0 value. Please transition to using devicetree.

config BOOTLOADER_ESP_IDF
bool "ESP-IDF bootloader support"
depends on SOC_FAMILY_ESP32 && !BOOTLOADER_MCUBOOT && !MCUBOOT
Expand Down
1 change: 0 additions & 1 deletion boards/arm/ast1030_evb/ast1030_evb_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
CONFIG_SOC_SERIES_AST10X0=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=200000000
CONFIG_MAIN_STACK_SIZE=4096
CONFIG_BOOTLOADER_SRAM_SIZE=0
CONFIG_FLASH_SIZE=0
CONFIG_FLASH_BASE_ADDRESS=0x0
CONFIG_XIP=n
Expand Down
1 change: 0 additions & 1 deletion boards/arm/scobc_module1/scobc_module1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ CONFIG_UART_CONSOLE=y
CONFIG_XIP=n
CONFIG_FLASH_SIZE=0
CONFIG_FLASH_BASE_ADDRESS=0x0
CONFIG_BOOTLOADER_SRAM_SIZE=0
3 changes: 3 additions & 0 deletions doc/releases/release-notes-3.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ Build system and infrastructure
* Added MCUboot image size reduction to sysbuild images which include MCUboot which prevents
issues with building firmware images that are too large for MCUboot to swap.

* Deprecated :kconfig:option:`CONFIG_BOOTLOADER_SRAM_SIZE`, users of this should transition to
having RAM set up properly in their board devicetree files.

Drivers and Sensors
*******************

Expand Down
4 changes: 0 additions & 4 deletions soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ config ROM_START_OFFSET
default 0x800 if XIP
default 0x0 if !XIP

# Override the setting in misc/Kconfig to allow full use of SRAM:
config BOOTLOADER_SRAM_SIZE
default 0 if !XIP

if !XIP
config FLASH_SIZE
default 0
Expand Down
4 changes: 0 additions & 4 deletions soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ config ROM_START_OFFSET
default 0x800 if XIP
default 0x0 if !XIP

# Override the setting in misc/Kconfig to allow full use of SRAM:
config BOOTLOADER_SRAM_SIZE
default 0 if !XIP

if !XIP
config FLASH_SIZE
default 0
Expand Down
Loading