espressif: add ESP32-C6, ESP32-C2 and ESP32-H2 new chips support

boot/espressif/CMakeLists.txt

@@ -20,7 +20,10 @@ if ("${MCUBOOT_TARGET}" STREQUAL "esp32" OR
  "${MCUBOOT_TARGET}" STREQUAL "esp32s2" OR
  "${MCUBOOT_TARGET}" STREQUAL "esp32s3")
  set(MCUBOOT_ARCH "xtensa")
-elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c3")
+elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c3" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32c6" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32c2" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32h2")
  set(MCUBOOT_ARCH "riscv")
 endif()
 
@@ -33,6 +36,12 @@ elseif("${MCUBOOT_TARGET}" STREQUAL "esp32s3")
  set(ESP_MIN_REVISION 0)
 elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c3")
  set(ESP_MIN_REVISION 3)
+elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c6")
+ set(ESP_MIN_REVISION 0)
+elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c2")
+ set(ESP_MIN_REVISION 0)
+elseif("${MCUBOOT_TARGET}" STREQUAL "esp32h2")
+ set(ESP_MIN_REVISION 0)
 else()
  message(FATAL_ERROR "Unsupported target ${MCUBOOT_TARGET}")
 endif()
@@ -104,6 +113,31 @@ else()
  set(esptool_path "${ESPTOOL_COMMAND}")
 endif()
 
+# Flash frequency parameter for esptool.py, for more information, check `esptool.py -h`
+if (NOT DEFINED ESP_FLASH_FREQ)
+ if ("${MCUBOOT_TARGET}" STREQUAL "esp32" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32s2" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32s3" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32c3" OR
+ "${MCUBOOT_TARGET}" STREQUAL "esp32c6")
+ set(ESP_FLASH_FREQ "40m")
+ elseif("${MCUBOOT_TARGET}" STREQUAL "esp32c2")
+ set(ESP_FLASH_FREQ "60m")
+ elseif("${MCUBOOT_TARGET}" STREQUAL "esp32h2")
+ set(ESP_FLASH_FREQ "24m")
+ endif()
+endif()
+
+# Flash mode parameter for esptool.py, for more information, check `esptool.py -h`
+if (NOT DEFINED ESP_FLASH_MODE)
+ set(ESP_FLASH_MODE "dio")
+endif()
+
+# Serial baud rate parameter for esptool.py flash use, for more information, check `esptool.py -h`
+if (NOT DEFINED ESP_BAUD_RATE)
+ set(ESP_BAUD_RATE 115200)
+endif()
+
 if (DEFINED CONFIG_ESP_SIGN_RSA)
  include(${CMAKE_CURRENT_LIST_DIR}/include/crypto_config/rsa.cmake)
 elseif (DEFINED CONFIG_ESP_SIGN_EC256)
@@ -294,7 +328,7 @@ add_custom_command(TARGET ${APP_EXECUTABLE} POST_BUILD
  COMMAND
  ${esptool_path}
  --chip ${MCUBOOT_TARGET} elf2image --min-rev ${ESP_MIN_REVISION}
- --flash_mode dio --flash_freq 40m --flash_size ${CONFIG_ESP_FLASH_SIZE}
+ --flash_mode ${ESP_FLASH_MODE} --flash_freq ${ESP_FLASH_FREQ} --flash_size ${CONFIG_ESP_FLASH_SIZE}
  -o ${APP_NAME}.bin ${APP_NAME}.elf
  )
 
@@ -314,9 +348,9 @@ add_custom_command(TARGET flash
  USES_TERMINAL
  COMMAND
  ${esptool_path}
- -p ${FLASH_PORT} -b 2000000 --before default_reset --after no_reset
+ -p ${FLASH_PORT} -b ${ESP_BAUD_RATE} --before default_reset --after no_reset
  --chip ${MCUBOOT_TARGET} write_flash
- --flash_mode dio --flash_size ${CONFIG_ESP_FLASH_SIZE}
- --flash_freq 40m ${CONFIG_ESP_BOOTLOADER_OFFSET}
+ --flash_mode ${ESP_FLASH_MODE} --flash_size ${CONFIG_ESP_FLASH_SIZE}
+ --flash_freq ${ESP_FLASH_FREQ} ${CONFIG_ESP_BOOTLOADER_OFFSET}
  ${APP_NAME}.bin
  )

boot/espressif/hal/include/esp32c2/esp32c2.cmake

@@ -0,0 +1,29 @@
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+#
+# SPDX-License-Identifier: Apache-2.0
+
+list(APPEND hal_srcs
+ ${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ ${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_table.c
+ ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/without_key_purposes/one_key_block/esp_efuse_api_key.c
+)
+
+if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
+ list(APPEND hal_srcs
+ ${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
+ )
+endif()
+
+list(APPEND LINKER_SCRIPTS
+ -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+)
+
+set_source_files_properties(
+ ${esp_hal_dir}/components/bootloader_support/src/esp_image_format.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_${MCUBOOT_TARGET}.c
+ ${esp_hal_dir}/components/hal/mmu_hal.c
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ PROPERTIES COMPILE_FLAGS
+ "-Wno-logical-op")

boot/espressif/hal/include/esp32c2/sdkconfig.h

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define BOOTLOADER_BUILD 1
+#define CONFIG_IDF_FIRMWARE_CHIP_ID 0x000C
+#define CONFIG_IDF_TARGET_ESP32C2 1
+#define CONFIG_ESP32C2_REV_MIN_0 1
+#define CONFIG_ESP32C2_REV_MIN_FULL 3
+#define CONFIG_ESP_REV_MIN_FULL CONFIG_ESP32C2_REV_MIN_FULL
+#define CONFIG_ESP32C2_REV_MIN 3
+#define CONFIG_ESP32C2_REV_MAX_FULL 99
+#define CONFIG_ESP_REV_MAX_FULL CONFIG_ESP32C2_REV_MAX_FULL
+#define CONFIG_IDF_TARGET_ARCH_RISCV 1
+#define CONFIG_MMU_PAGE_SIZE 0x10000
+#define CONFIG_XTAL_FREQ_26 1
+#define CONFIG_XTAL_FREQ 26
+#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
+#define CONFIG_MCUBOOT 1
+#define NDEBUG 1
+#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
+#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
+#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
+#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
+#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
+#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
+#define CONFIG_EFUSE_MAX_BLK_LEN 256
+#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32c6/esp32c6.cmake

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+#
+# SPDX-License-Identifier: Apache-2.0
+
+list(APPEND include_dirs
+ ${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/private_include
+)
+
+list(APPEND hal_srcs
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
+ ${esp_hal_dir}/components/esp_rom/patches/esp_rom_regi2c_${MCUBOOT_TARGET}.c
+)
+
+if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
+ list(APPEND hal_srcs
+ ${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
+ )
+endif()
+
+list(APPEND LINKER_SCRIPTS
+ -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+)
+
+set_source_files_properties(
+ ${esp_hal_dir}/components/bootloader_support/src/esp_image_format.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_${MCUBOOT_TARGET}.c
+ ${esp_hal_dir}/components/hal/mmu_hal.c
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ PROPERTIES COMPILE_FLAGS
+ "-Wno-logical-op")

boot/espressif/hal/include/esp32c6/sdkconfig.h

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define BOOTLOADER_BUILD 1
+#define CONFIG_IDF_FIRMWARE_CHIP_ID 0x000D
+#define CONFIG_IDF_TARGET_ESP32C6 1
+#define CONFIG_ESP32C6_REV_MIN_0 1
+#define CONFIG_ESP32C6_REV_MIN_FULL 0
+#define CONFIG_ESP_REV_MIN_FULL CONFIG_ESP32C6_REV_MIN_FULL
+#define CONFIG_ESP32C6_REV_MIN 0
+#define CONFIG_ESP32C6_REV_MAX_FULL 99
+#define CONFIG_ESP_REV_MAX_FULL CONFIG_ESP32C6_REV_MAX_FULL
+#define CONFIG_IDF_TARGET_ARCH_RISCV 1
+#define CONFIG_MMU_PAGE_SIZE 0x10000
+#define SOC_MMU_PAGE_SIZE CONFIG_MMU_PAGE_SIZE /* from soc/CMakeLists */
+#define CONFIG_XTAL_FREQ 40
+#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
+#define CONFIG_MCUBOOT 1
+#define NDEBUG 1
+#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
+#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
+#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
+#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
+#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
+#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
+#define CONFIG_EFUSE_MAX_BLK_LEN 256
+#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/esp32h2/esp32h2.cmake

@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+#
+# SPDX-License-Identifier: Apache-2.0
+
+list(APPEND include_dirs
+ ${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/private_include
+)
+
+list(APPEND hal_srcs
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ ${esp_hal_dir}/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
+ ${esp_hal_dir}/components/esp_rom/patches/esp_rom_regi2c_${MCUBOOT_TARGET}.c
+)
+
+if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
+ list(APPEND hal_srcs
+ ${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
+ )
+endif()
+
+list(APPEND LINKER_SCRIPTS
+ -T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
+)
+
+set_source_files_properties(
+ ${esp_hal_dir}/components/bootloader_support/src/esp_image_format.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
+ ${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_${MCUBOOT_TARGET}.c
+ ${esp_hal_dir}/components/hal/mmu_hal.c
+ ${esp_hal_dir}/components/hal/cache_hal.c
+ PROPERTIES COMPILE_FLAGS
+ "-Wno-logical-op")

boot/espressif/hal/include/esp32h2/sdkconfig.h

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#define BOOTLOADER_BUILD 1
+#define CONFIG_IDF_FIRMWARE_CHIP_ID 0x0010
+#define CONFIG_IDF_TARGET_ESP32H2 1
+#define CONFIG_ESP32H2_REV_MIN_0 1
+#define CONFIG_ESP32H2_REV_MIN_FULL 0
+#define CONFIG_ESP_REV_MIN_FULL CONFIG_ESP32H2_REV_MIN_FULL
+#define CONFIG_ESP32H2_REV_MIN 0
+#define CONFIG_ESP32H2_REV_MAX_FULL 99
+#define CONFIG_ESP_REV_MAX_FULL CONFIG_ESP32H2_REV_MAX_FULL
+#define CONFIG_IDF_TARGET_ARCH_RISCV 1
+#define CONFIG_MMU_PAGE_SIZE 0x10000
+#define SOC_MMU_PAGE_SIZE CONFIG_MMU_PAGE_SIZE /* from soc/CMakeLists */
+#define CONFIG_XTAL_FREQ_32 1
+#define CONFIG_XTAL_FREQ 32
+#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
+#define CONFIG_MCUBOOT 1
+#define NDEBUG 1
+#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
+#define CONFIG_ESP_CONSOLE_UART_BAUDRATE 115200
+#define CONFIG_BOOTLOADER_OFFSET_IN_FLASH 0x0000
+#define CONFIG_PARTITION_TABLE_OFFSET 0x10000
+#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
+#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
+#define CONFIG_EFUSE_MAX_BLK_LEN 256
+#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

boot/espressif/hal/include/mcuboot_config/mcuboot_logging.h

@@ -25,6 +25,12 @@ extern int ets_printf(const char *fmt, ...);
 #define TARGET "[esp32s3]"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define TARGET "[esp32c3]"
+#elif CONFIG_IDF_TARGET_ESP32C6
+#define TARGET "[esp32c6]"
+#elif CONFIG_IDF_TARGET_ESP32C2
+#define TARGET "[esp32c2]"
+#elif CONFIG_IDF_TARGET_ESP32H2
+#define TARGET "[esp32h2]"
 #else
 #error "Selected target not supported."
 #endif

boot/espressif/hal/src/esp32c2/console_uart_custom.c

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <esp_rom_uart.h>
+#include <hal/uart_ll.h>
+#include <soc/uart_periph.h>
+
+#if CONFIG_ESP_CONSOLE_UART_CUSTOM
+static uart_dev_t *alt_console_uart_dev = (CONFIG_ESP_CONSOLE_UART_NUM == 0) ?
+ &UART0 :
+ &UART1;
+
+void IRAM_ATTR esp_rom_uart_putc(char c)
+{
+ while (uart_ll_get_txfifo_len(alt_console_uart_dev) == 0);
+ uart_ll_write_txfifo(alt_console_uart_dev, (const uint8_t *) &c, 1);
+}
+#endif

boot/espressif/hal/src/esp32c6/console_uart_custom.c

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <esp_rom_uart.h>
+#include <hal/uart_ll.h>
+#include <soc/uart_periph.h>
+
+#if CONFIG_ESP_CONSOLE_UART_CUSTOM
+static uart_dev_t *alt_console_uart_dev = (CONFIG_ESP_CONSOLE_UART_NUM == 0) ?
+ &UART0 :
+ &UART1;
+
+void IRAM_ATTR esp_rom_uart_putc(char c)
+{
+ while (uart_ll_get_txfifo_len(alt_console_uart_dev) == 0);
+ uart_ll_write_txfifo(alt_console_uart_dev, (const uint8_t *) &c, 1);
+}
+#endif
+

boot/espressif/hal/src/esp32h2/console_uart_custom.c

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <esp_rom_uart.h>
+#include <hal/uart_ll.h>
+#include <soc/uart_periph.h>
+
+#if CONFIG_ESP_CONSOLE_UART_CUSTOM
+static uart_dev_t *alt_console_uart_dev = (CONFIG_ESP_CONSOLE_UART_NUM == 0) ?
+ &UART0 :
+ &UART1;
+
+void IRAM_ATTR esp_rom_uart_putc(char c)
+{
+ while (uart_ll_get_txfifo_len(alt_console_uart_dev) == 0);
+ uart_ll_write_txfifo(alt_console_uart_dev, (const uint8_t *) &c, 1);
+}
+#endif