From f08b75e94cdb2b3ba753eed1db32c134d652b2bb Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 14 Nov 2023 07:49:45 +0000 Subject: [PATCH 1/3] various: Remove BOOTLOADER_SRAM_SIZE overrides Removes settings this Kconfig to 0, because the default already is 0 Signed-off-by: Jamie McCrae --- boards/arm/ast1030_evb/ast1030_evb_defconfig | 1 - boards/arm/scobc_module1/scobc_module1_defconfig | 1 - soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf | 4 ---- soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf | 4 ---- 4 files changed, 10 deletions(-) diff --git a/boards/arm/ast1030_evb/ast1030_evb_defconfig b/boards/arm/ast1030_evb/ast1030_evb_defconfig index 6a0e696b39bfe0..62278d4421327d 100644 --- a/boards/arm/ast1030_evb/ast1030_evb_defconfig +++ b/boards/arm/ast1030_evb/ast1030_evb_defconfig @@ -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 diff --git a/boards/arm/scobc_module1/scobc_module1_defconfig b/boards/arm/scobc_module1/scobc_module1_defconfig index 8ec2b6795577bd..ecadcfc07bd92f 100644 --- a/boards/arm/scobc_module1/scobc_module1_defconfig +++ b/boards/arm/scobc_module1/scobc_module1_defconfig @@ -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 diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf index e082df05a80d29..461802f2155ad4 100644 --- a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf +++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf @@ -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 diff --git a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf index 86c881a40f9acc..37852a154a015b 100644 --- a/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf +++ b/soc/arm/ti_simplelink/cc32xx/Kconfig.defconfig.cc3235sf @@ -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 From 806c5374aef21ea7f051451dfc518cdec36a73da Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 14 Nov 2023 07:50:48 +0000 Subject: [PATCH 2/3] kconfig: Deprecate BOOTLOADER_SRAM_SIZE This Kconfig is seemingly unused with exception to a single board, whose maintainers have been unresponsive for a long time. It is not useful to any other board and can be set in dts, therefore deprecate it and schedule removal after the Zephyr 3.7 release Signed-off-by: Jamie McCrae --- Kconfig.zephyr | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 8b48eca6fcd96c..c384c8053f9fb5 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -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 @@ -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 From fecc12aaa6abbafbf666b5d7a47457e1b1fb0752 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 14 Nov 2023 07:56:39 +0000 Subject: [PATCH 3/3] doc: release: 3.6: Add note on deprecating Kconfig Adds a note that CONFIG_BOOTLOADER_SRAM_SIZE has been deprecated Signed-off-by: Jamie McCrae --- doc/releases/release-notes-3.6.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/releases/release-notes-3.6.rst b/doc/releases/release-notes-3.6.rst index 265f994c60066e..3eb17ff1d6c25d 100644 --- a/doc/releases/release-notes-3.6.rst +++ b/doc/releases/release-notes-3.6.rst @@ -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 *******************