arch/xtensa/esp32: Implement board_boot_image for mcuboot/nxboot support

Documentation/platforms/xtensa/esp32/boards/esp32-devkitc/index.rst

@@ -655,6 +655,12 @@ This configuration is the same as the ``nsh`` configuration, but it generates th
 image in a format that can be used by MCUboot. It also makes the ``make bootloader`` command to
 build the MCUboot bootloader image using the Espressif HAL.
 
+When ``mcuboot`` is used as bootloader, this board uses the
+``board_boot_image()`` implementation in the chain-boot path through
+``boardctl(BOARDIOC_BOOT_IMAGE)``.
+See :doc:`/applications/boot/mcuboot/index` for general MCUboot boot flow
+details and platform requirements.
+
 mcuboot_update_agent
 --------------------
 

arch/xtensa/include/esp32/partition.h

@@ -35,23 +35,23 @@
 
 enum ota_img_ctrl
 {
-  OTA_IMG_GET_BOOT = 0xe1,
-  OTA_IMG_SET_BOOT = 0xe2,
-  OTA_IMG_SET_ENCRYPTED = 0xe3,
-  OTA_IMG_GET_ENCRYPTED = 0xe4,
-  OTA_IMG_GET_TYPE = 0xe5,
-  OTA_IMG_GET_SUBTYPE = 0xe6,
-  OTA_IMG_INVALIDATE_BOOT = 0xe7,
+  OTA_IMG_GET_BOOT          = 0xe1,
+  OTA_IMG_SET_BOOT          = 0xe2,
+  OTA_IMG_SET_ENCRYPTED     = 0xe3,
+  OTA_IMG_GET_ENCRYPTED     = 0xe4,
+  OTA_IMG_GET_TYPE          = 0xe5,
+  OTA_IMG_GET_SUBTYPE       = 0xe6,
+  OTA_IMG_INVALIDATE_BOOT   = 0xe7,
   OTA_IMG_IS_MAPPED_AS_TEXT = 0xe8,
 };
 
 /* OTA image boot sequency */
 
 enum ota_img_bootseq
 {
-  OTA_IMG_BOOT_FACTORY    = 0,
-  OTA_IMG_BOOT_OTA_0      = 1,
-  OTA_IMG_BOOT_OTA_1      = 2,
+  OTA_IMG_BOOT_FACTORY = 0,
+  OTA_IMG_BOOT_OTA_0   = 1,
+  OTA_IMG_BOOT_OTA_1   = 2,
   OTA_IMG_BOOT_SEQ_MAX
 };
 
@@ -72,7 +72,7 @@ enum ota_img_bootseq
  *
  ****************************************************************************/
 
-int esp32_partition_read_decrypt(const char *label, size_t offset,
-                                 void *buf, size_t size);
+int esp32_partition_read_decrypt(const char *label, size_t offset, void *buf,
+                                 size_t size);
 
 #endif /* __ARCH_XTENSA_INCLUDE_ESP32_PARTITION_H */

boards/xtensa/esp32/common/src/Make.defs

@@ -178,6 +178,10 @@ ifeq ($(CONFIG_ETC_ROMFS),y)
   RCSRCS  = etc/init.d/rc.sysinit etc/init.d/rcS
 endif
 
+ifeq ($(CONFIG_BOARDCTL_BOOT_IMAGE),y)
+  CSRCS += esp32_boot_image.c
+endif
+
 DEPPATH += --dep-path src
 VPATH += :src
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)src