You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/03/19 14:10:04 UTC
[incubator-nuttx] 02/04: boards/xtensa/esp32: Fix mcuboot configs
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2d906bb28fbd8793982f230032999473936d9db5
Author: Gerson Fernando Budke <ge...@ossystems.com.br>
AuthorDate: Sun Feb 27 09:28:57 2022 -0300
boards/xtensa/esp32: Fix mcuboot configs
MCUboot apps were moved to examples directory. This fix configs due to
recent changes.
Signed-off-by: Gerson Fernando Budke <ge...@ossystems.com.br>
---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
.../configs/{mcuboot_confirm => mcuboot_slot_confirm}/defconfig | 3 +--
.../configs/{mcuboot_agent => mcuboot_update_agent}/defconfig | 5 ++---
6 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
index 6ce4311..35893fa 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_slot_confirm/defconfig
@@ -20,12 +20,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
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
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
index 44a2650..c2f1daa 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcuboot_update_agent/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -35,6 +34,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=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
@@ -44,8 +45,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
index 4e41506..6689951 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_slot_confirm/defconfig
@@ -19,12 +19,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
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
@@ -32,7 +32,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
index 6aa6989..f15aa3e 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/mcuboot_update_agent/defconfig
@@ -19,7 +19,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -34,6 +33,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=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
@@ -42,8 +43,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
similarity index 96%
rename from boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig
rename to boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
index 23b0a36..fe502d7 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_confirm/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_slot_confirm/defconfig
@@ -20,12 +20,12 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
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
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
-CONFIG_MCUBOOT_SLOT_CONFIRM_EXAMPLE=y
CONFIG_MM_REGIONS=3
CONFIG_NSH_ARCHINIT=y
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
similarity index 94%
rename from boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig
rename to boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
index 4cd880b..b09ed27 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_agent/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/mcuboot_update_agent/defconfig
@@ -20,7 +20,6 @@ CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_XTENSA=y
CONFIG_BOARDCTL_RESET=y
CONFIG_BOARD_LOOPSPERMSEC=16717
-CONFIG_BOOT_MCUBOOT=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_ASSERTIONS=y
CONFIG_DEBUG_ERROR=y
@@ -35,6 +34,8 @@ CONFIG_ESP32_APP_FORMAT_MCUBOOT=y
CONFIG_ESP32_SPIFLASH=y
CONFIG_ESP32_UART0=y
CONFIG_ESP32_WIRELESS=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
@@ -43,8 +44,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_FLOATINGPOINT=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE=y
-CONFIG_MCUBOOT_UPDATE_AGENT_EXAMPLE_DL_BUFFER_SIZE=4096
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y