You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ar...@apache.org on 2023/12/22 09:28:04 UTC
(nuttx) branch master updated: espressif/mcuboot: Fix dependency of the Espressif's port MCUboot.
This is an automated email from the ASF dual-hosted git repository.
archer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new daec4cf408 espressif/mcuboot: Fix dependency of the Espressif's port MCUboot.
daec4cf408 is described below
commit daec4cf4082d0391ac5ca2ad73e6c866d29e6d2c
Author: Tiago Medicci Serrano <ti...@espressif.com>
AuthorDate: Wed Dec 20 16:50:07 2023 -0300
espressif/mcuboot: Fix dependency of the Espressif's port MCUboot.
If the MCUboot (from nuttx-apps) is selected, the Espressif's port
of the MCUboot is not used as the 2nd stage bootloader.
---
arch/risc-v/src/esp32c3/Kconfig | 1 +
arch/xtensa/src/esp32/Kconfig | 1 +
arch/xtensa/src/esp32s2/Kconfig | 1 +
arch/xtensa/src/esp32s3/Kconfig | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/risc-v/src/esp32c3/Kconfig b/arch/risc-v/src/esp32c3/Kconfig
index 354187bcdf..a8b1caa8f3 100644
--- a/arch/risc-v/src/esp32c3/Kconfig
+++ b/arch/risc-v/src/esp32c3/Kconfig
@@ -1051,6 +1051,7 @@ config ESP32C3_APP_FORMAT_LEGACY
config ESP32C3_APP_FORMAT_MCUBOOT
bool "MCUboot-bootable format"
+ depends on !MCUBOOT_BOOTLOADER
select ESP32C3_HAVE_OTA_PARTITION
---help---
The Espressif port of MCUboot supports the loading of unsegmented firmware
diff --git a/arch/xtensa/src/esp32/Kconfig b/arch/xtensa/src/esp32/Kconfig
index 9794746ce1..0e374b24d9 100644
--- a/arch/xtensa/src/esp32/Kconfig
+++ b/arch/xtensa/src/esp32/Kconfig
@@ -2462,6 +2462,7 @@ config ESP32_APP_FORMAT_LEGACY
config ESP32_APP_FORMAT_MCUBOOT
bool "MCUboot-bootable format"
+ depends on !MCUBOOT_BOOTLOADER
select ESP32_HAVE_OTA_PARTITION
---help---
The ESP32 port of MCUboot supports the loading of unsegmented firmware
diff --git a/arch/xtensa/src/esp32s2/Kconfig b/arch/xtensa/src/esp32s2/Kconfig
index bdda62eb02..5f40582572 100644
--- a/arch/xtensa/src/esp32s2/Kconfig
+++ b/arch/xtensa/src/esp32s2/Kconfig
@@ -1211,6 +1211,7 @@ config ESP32S2_APP_FORMAT_LEGACY
config ESP32S2_APP_FORMAT_MCUBOOT
bool "MCUboot-bootable format"
+ depends on !MCUBOOT_BOOTLOADER
select ESP32S2_HAVE_OTA_PARTITION
---help---
The Espressif port of MCUboot supports the loading of unsegmented firmware
diff --git a/arch/xtensa/src/esp32s3/Kconfig b/arch/xtensa/src/esp32s3/Kconfig
index 8cb56eb8c4..88e3c892ef 100644
--- a/arch/xtensa/src/esp32s3/Kconfig
+++ b/arch/xtensa/src/esp32s3/Kconfig
@@ -2169,6 +2169,7 @@ config ESP32S3_APP_FORMAT_LEGACY
config ESP32S3_APP_FORMAT_MCUBOOT
bool "MCUboot-bootable format"
+ depends on !MCUBOOT_BOOTLOADER
select ESP32S3_HAVE_OTA_PARTITION
---help---
The Espressif port of MCUboot supports the loading of unsegmented firmware