From e77e12e145a2cc1bac949e89e21706218cf1dec0 Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Fri, 20 Jan 2023 15:28:34 -0300 Subject: [PATCH] espressif: Stabilize MCUboot support on Espressif chips MCUboot support is no longer behind EXPERIMENTAL for the following chips: - ESP32 - ESP32-S2 - ESP32-S3 - ESP32-C3 Signed-off-by: Gustavo Henrique Nihei --- arch/risc-v/src/esp32c3/Kconfig | 4 ---- arch/xtensa/src/esp32/Kconfig | 4 ---- arch/xtensa/src/esp32s2/Kconfig | 4 ---- arch/xtensa/src/esp32s3/Kconfig | 5 ----- .../esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig | 1 - .../esp32-devkitc/configs/mcuboot_slot_confirm/defconfig | 1 - .../esp32-devkitc/configs/mcuboot_update_agent/defconfig | 1 - .../configs/mcuboot_slot_confirm/defconfig | 1 - .../configs/mcuboot_update_agent/defconfig | 1 - .../esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig | 1 - .../esp32-wrover-kit/configs/mcuboot_update_agent/defconfig | 1 - .../esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig | 1 - .../esp32s3/esp32s3-devkit/configs/mcuboot_nsh/defconfig | 1 - 13 files changed, 26 deletions(-) diff --git a/arch/risc-v/src/esp32c3/Kconfig b/arch/risc-v/src/esp32c3/Kconfig index 5251916dba..1d0bee2140 100644 --- a/arch/risc-v/src/esp32c3/Kconfig +++ b/arch/risc-v/src/esp32c3/Kconfig @@ -1080,14 +1080,10 @@ config ESP32C3_APP_FORMAT_LEGACY config ESP32C3_APP_FORMAT_MCUBOOT bool "MCUboot-bootable format" select ESP32C3_HAVE_OTA_PARTITION - depends on EXPERIMENTAL ---help--- The Espressif port of MCUboot supports the loading of unsegmented firmware images. -comment "MCUboot support depends on CONFIG_EXPERIMENTAL" - depends on !EXPERIMENTAL - endchoice # Application Image Format choice diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig index 5e5305fdb6..987eb1b1c1 100644 --- a/arch/xtensa/src/esp32/Kconfig +++ b/arch/xtensa/src/esp32/Kconfig @@ -2339,14 +2339,10 @@ config ESP32_APP_FORMAT_LEGACY config ESP32_APP_FORMAT_MCUBOOT bool "MCUboot-bootable format" select ESP32_HAVE_OTA_PARTITION - depends on EXPERIMENTAL ---help--- The ESP32 port of MCUboot supports the loading of unsegmented firmware images. -comment "MCUboot support depends on CONFIG_EXPERIMENTAL" - depends on !EXPERIMENTAL - endchoice # Application Image Format choice diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig index 166ed14f81..b1b0930bb0 100644 --- a/arch/xtensa/src/esp32s2/Kconfig +++ b/arch/xtensa/src/esp32s2/Kconfig @@ -886,14 +886,10 @@ config ESP32S2_APP_FORMAT_LEGACY config ESP32S2_APP_FORMAT_MCUBOOT bool "MCUboot-bootable format" select ESP32S2_HAVE_OTA_PARTITION - depends on EXPERIMENTAL ---help--- The Espressif port of MCUboot supports the loading of unsegmented firmware images. -comment "MCUboot support depends on CONFIG_EXPERIMENTAL" - depends on !EXPERIMENTAL - endchoice # Application Image Format choice diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig index 220ce4648d..19e5e701da 100644 --- a/arch/xtensa/src/esp32s3/Kconfig +++ b/arch/xtensa/src/esp32s3/Kconfig @@ -932,15 +932,10 @@ config ESP32S3_APP_FORMAT_LEGACY config ESP32S3_APP_FORMAT_MCUBOOT bool "MCUboot-bootable format" select ESP32S3_HAVE_OTA_PARTITION - depends on EXPERIMENTAL ---help--- The Espressif port of MCUboot supports the loading of unsegmented firmware images. -comment "MCUboot support depends on CONFIG_EXPERIMENTAL" - depends on !EXPERIMENTAL - - endchoice # Application Image Format choice diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig index ae1987d0cc..b95e1c0cb9 100644 --- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig +++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/mcuboot_slot_confirm/defconfig @@ -25,7 +25,6 @@ CONFIG_ESP32C3_APP_FORMAT_MCUBOOT=y CONFIG_ESP32C3_ESPTOOL_TARGET_SECONDARY=y CONFIG_ESP32C3_SPIFLASH=y CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_FS_SMARTFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig index e4b9988cc8..f4270e266e 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig @@ -25,7 +25,6 @@ CONFIG_ESP32_ESPTOOL_TARGET_SECONDARY=y CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_UART0=y CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig index e5bd767f1b..755dc16c11 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig @@ -35,7 +35,6 @@ CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096 -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig index 067ce8c6bd..df0b3f0be8 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig @@ -24,7 +24,6 @@ CONFIG_ESP32_ESPTOOL_TARGET_SECONDARY=y CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_UART0=y CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig index 5e9107810f..eb9b0d2009 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig @@ -34,7 +34,6 @@ CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096 -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig index 136be7ef2d..6dcc02356c 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig @@ -25,7 +25,6 @@ CONFIG_ESP32_ESPTOOL_TARGET_SECONDARY=y CONFIG_ESP32_SPIFLASH=y CONFIG_ESP32_UART0=y CONFIG_EXAMPLES_MCUBOOT_SLOT_CONFIRM=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig index 1473d035eb..6e3df28548 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig +++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig @@ -35,7 +35,6 @@ CONFIG_ESP32_UART0=y CONFIG_ESP32_WIFI=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT=y CONFIG_EXAMPLES_MCUBOOT_UPDATE_AGENT_DL_BUFFER_SIZE=4096 -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig index 756687d242..e7f434efbb 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/configs/mcuboot_nsh/defconfig @@ -22,7 +22,6 @@ CONFIG_BUILTIN=y CONFIG_ESP32S2_APP_FORMAT_MCUBOOT=y CONFIG_ESP32S2_SPIFLASH=y CONFIG_ESP32S2_UART0=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_nsh/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_nsh/defconfig index b1665dedd5..92084c99b6 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_nsh/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/mcuboot_nsh/defconfig @@ -23,7 +23,6 @@ CONFIG_BUILTIN=y CONFIG_ESP32S3_APP_FORMAT_MCUBOOT=y CONFIG_ESP32S3_SPIFLASH=y CONFIG_ESP32S3_UART0=y -CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y