Skip to content

Commit 54ef484

Browse files
almir-okatoalmir-okato
committed
espressif: remove IDF git submodule and add its reference by param
Remove the ESP-IDF from git submodules to avoid potential duplicated repo clones on the user system. IDF HAL code is still a dependency for Espressif port, therefore now the HAL code reference needs to be passed by parameter when building. The Espressif port was also updated to work with last v5.1 IDF code. Signed-off-by: Almir Okato <almir.okato@espressif.com>
1 parent 26ed3f4 commit 54ef484

39 files changed

+389
-1107
lines changed

‎.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,3 @@
1919
[submodule "boot/cypress/libs/cy-mbedtls-acceleration"]
2020
path = boot/cypress/libs/cy-mbedtls-acceleration
2121
url = https://github.com/cypresssemiconductorco/cy-mbedtls-acceleration.git
22-
[submodule "boot/espressif/hal/esp-idf"]
23-
path = boot/espressif/hal/esp-idf
24-
url = https://github.com/espressif/esp-idf.git
25-
branch = release/v4.4

‎boot/espressif/CMakeLists.txt

+15-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
cmake_minimum_required(VERSION 3.13)
6+
cmake_policy(SET CMP0109 NEW)
67

78
include(${CMAKE_CURRENT_LIST_DIR}/tools/utils.cmake)
89

@@ -36,13 +37,15 @@ else()
3637
message(FATAL_ERROR "Unsupported target ${MCUBOOT_TARGET}")
3738
endif()
3839

39-
if (NOT DEFINED IDF_PATH)
40-
if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")
41-
set(IDF_PATH "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")
42-
elseif (DEFINED ENV{IDF_PATH})
43-
set(IDF_PATH $ENV{IDF_PATH})
40+
if (NOT DEFINED ESP_HAL_PATH)
41+
if (DEFINED ENV{ESP_HAL_PATH})
42+
set(ESP_HAL_PATH $ENV{ESP_HAL_PATH})
4443
else()
45-
message(FATAL_ERROR "IDF_PATH not found. Please update submodules or set IDF_PATH environment variable or pass -DIDF_PATH flag.")
44+
message(WARNING "ESP_HAL_PATH not found. Please set -DESP_HAL_PATH parameter or define ESP_HAL_PATH environment variable.")
45+
if (DEFINED ENV{IDF_PATH})
46+
set(ESP_HAL_PATH $ENV{IDF_PATH})
47+
message("IDF installation found in the system, using IDF_PATH as ESP_HAL_PATH.")
48+
endif()
4649
endif()
4750
endif()
4851

@@ -92,7 +95,11 @@ find_program(ESPTOOL_COMMAND
9295
NAMES esptool esptool.py
9396
)
9497
if ("${ESPTOOL_COMMAND}" MATCHES "ESPTOOL_COMMAND-NOTFOUND")
95-
set(esptool_path "${IDF_PATH}/components/esptool_py/esptool/esptool.py")
98+
if (DEFINED ENV{IDF_PATH})
99+
set(esptool_path "${IDF_PATH}/components/esptool_py/esptool/esptool.py")
100+
else()
101+
message(FATAL_ERROR "esptool.py not found. Please install it using \'pip install esptool\'.")
102+
endif()
96103
else()
97104
set(esptool_path "${ESPTOOL_COMMAND}")
98105
endif()
@@ -179,7 +186,7 @@ set(CFLAGS
179186
"-ggdb"
180187
"-Os"
181188
"-D_GNU_SOURCE"
182-
"-std=gnu99"
189+
"-std=gnu17"
183190
"-Wno-old-style-declaration"
184191
"-Wno-implicit-int"
185192
"-Wno-declaration-after-statement"

‎boot/espressif/hal/CMakeLists.txt

+101-79
Original file line numberDiff line numberDiff line change
@@ -6,100 +6,115 @@ cmake_minimum_required(VERSION 3.13)
66

77
project(hal)
88

9-
set(esp_idf_dir ${IDF_PATH})
10-
9+
set(esp_hal_dir ${ESP_HAL_PATH})
1110
set(src_dir ${CMAKE_CURRENT_LIST_DIR}/src)
1211
set(include_dirs
1312
${CMAKE_CURRENT_LIST_DIR}/include
1413
${CMAKE_CURRENT_LIST_DIR}/include/${MCUBOOT_TARGET}
1514
)
1615

1716
list(APPEND include_dirs
18-
${esp_idf_dir}/components/${MCUBOOT_ARCH}/include
19-
${esp_idf_dir}/components/esp_common/include
20-
${esp_idf_dir}/components/esp_rom/include
21-
${esp_idf_dir}/components/esp_rom/include/${MCUBOOT_TARGET}
22-
${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}
23-
${esp_idf_dir}/components/spi_flash/include
24-
${esp_idf_dir}/components/spi_flash/include/spi_flash
25-
${esp_idf_dir}/components/esp_hw_support/include
26-
${esp_idf_dir}/components/esp_hw_support/include/soc
27-
${esp_idf_dir}/components/esp_hw_support/include/soc/${MCUBOOT_TARGET}
28-
${esp_idf_dir}/components/esp_hw_support/port/include
29-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}
30-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/private_include
31-
${esp_idf_dir}/components/soc/include
32-
${esp_idf_dir}/components/soc/${MCUBOOT_TARGET}/include
33-
${esp_idf_dir}/components/bootloader_support/include
34-
${esp_idf_dir}/components/bootloader_support/include_bootloader
35-
${esp_idf_dir}/components/hal/include
36-
${esp_idf_dir}/components/hal/platform_port/include
37-
${esp_idf_dir}/components/hal/${MCUBOOT_TARGET}/include
38-
${esp_idf_dir}/components/hal/${MCUBOOT_TARGET}/include/hal
39-
${esp_idf_dir}/components/heap/include
40-
${esp_idf_dir}/components/efuse/include
41-
${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/include
42-
${esp_idf_dir}/components/efuse/private_include
43-
${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/private_include
44-
${esp_idf_dir}/components/esp_system/include
45-
${esp_idf_dir}/components/newlib/platform_include
17+
${esp_hal_dir}/components/bootloader_support/include
18+
${esp_hal_dir}/components/bootloader_support/private_include
19+
${esp_hal_dir}/components/bootloader_support/bootloader_flash/include
20+
${esp_hal_dir}/components/spi_flash/include
21+
${esp_hal_dir}/components/spi_flash/include/spi_flash
22+
${esp_hal_dir}/components/esp_app_format/include
23+
${esp_hal_dir}/components/newlib/platform_include
24+
${esp_hal_dir}/components/esp_common/include
25+
${esp_hal_dir}/components/${MCUBOOT_ARCH}/include
26+
${esp_hal_dir}/components/esp_rom/include
27+
${esp_hal_dir}/components/esp_rom/include/${MCUBOOT_TARGET}
28+
${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}
29+
${esp_hal_dir}/components/soc/include
30+
${esp_hal_dir}/components/soc/${MCUBOOT_TARGET}
31+
${esp_hal_dir}/components/soc/${MCUBOOT_TARGET}/include
32+
${esp_hal_dir}/components/efuse/include
33+
${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/include
34+
${esp_hal_dir}/components/efuse/private_include
35+
${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/private_include
36+
${esp_hal_dir}/components/esp_hw_support/include
37+
${esp_hal_dir}/components/esp_hw_support/include/soc
38+
${esp_hal_dir}/components/esp_hw_support/include/soc/${MCUBOOT_TARGET}
39+
${esp_hal_dir}/components/esp_hw_support/port/include
40+
${esp_hal_dir}/components/esp_hw_support/include/esp_private
41+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}
42+
${esp_hal_dir}/components/hal/${MCUBOOT_TARGET}/include
43+
${esp_hal_dir}/components/hal/include
44+
${esp_hal_dir}/components/hal/platform_port/include
45+
${esp_hal_dir}/components/esp_system/include
46+
${esp_hal_dir}/components/log/include
4647
)
4748

4849
if("${MCUBOOT_ARCH}" STREQUAL "xtensa")
4950
list(APPEND include_dirs
50-
${esp_idf_dir}/components/${MCUBOOT_ARCH}/${MCUBOOT_TARGET}/include
51+
${esp_hal_dir}/components/${MCUBOOT_ARCH}/${MCUBOOT_TARGET}/include
52+
${esp_hal_dir}/components/${MCUBOOT_ARCH}/include
5153
)
5254
endif()
5355

5456
set(hal_srcs
55-
${src_dir}/bootloader_init_common.c
57+
${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_${MCUBOOT_TARGET}.c
58+
${esp_hal_dir}/components/bootloader_support/src/bootloader_init.c
59+
${esp_hal_dir}/components/bootloader_support/src/bootloader_common.c
60+
${esp_hal_dir}/components/bootloader_support/src/bootloader_common_loader.c
61+
${esp_hal_dir}/components/bootloader_support/src/bootloader_console.c
62+
${esp_hal_dir}/components/bootloader_support/src/bootloader_console_loader.c
63+
${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
64+
${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_${MCUBOOT_TARGET}.c
65+
${esp_hal_dir}/components/bootloader_support/src/bootloader_clock_init.c
66+
${esp_hal_dir}/components/bootloader_support/src/bootloader_clock_loader.c
67+
${esp_hal_dir}/components/bootloader_support/src/bootloader_efuse.c
68+
${esp_hal_dir}/components/bootloader_support/src/bootloader_panic.c
69+
${esp_hal_dir}/components/bootloader_support/src/bootloader_mem.c
70+
${esp_hal_dir}/components/bootloader_support/src/bootloader_random.c
71+
${esp_hal_dir}/components/bootloader_support/src/bootloader_random_${MCUBOOT_TARGET}.c
72+
${esp_hal_dir}/components/bootloader_support/src/bootloader_utility.c
73+
${esp_hal_dir}/components/bootloader_support/src/esp_image_format.c
74+
${esp_hal_dir}/components/bootloader_support/src/secure_boot_v2/secure_boot_signatures_bootloader.c
75+
${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_soc.c
76+
${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_sha.c
77+
${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/secure_boot_secure_features.c
78+
${esp_hal_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/flash_encryption_secure_features.c
79+
${esp_hal_dir}/components/hal/mpu_hal.c
80+
${esp_hal_dir}/components/hal/efuse_hal.c
81+
${esp_hal_dir}/components/hal/mmu_hal.c
82+
${esp_hal_dir}/components/hal/wdt_hal_iram.c
83+
${esp_hal_dir}/components/hal/${MCUBOOT_TARGET}/efuse_hal.c
84+
${esp_hal_dir}/components/soc/${MCUBOOT_TARGET}/uart_periph.c
85+
${esp_hal_dir}/components/soc/${MCUBOOT_TARGET}/gpio_periph.c
86+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_time.c
87+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk.c
88+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk_init.c
89+
${esp_hal_dir}/components/esp_rom/patches/esp_rom_uart.c
90+
${esp_hal_dir}/components/esp_rom/patches/esp_rom_sys.c
91+
${esp_hal_dir}/components/esp_rom/patches/esp_rom_spiflash.c
92+
${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_table.c
93+
${esp_hal_dir}/components/efuse/src/esp_efuse_fields.c
94+
${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_fields.c
95+
${esp_hal_dir}/components/efuse/src/esp_efuse_api.c
96+
${esp_hal_dir}/components/efuse/src/esp_efuse_utility.c
97+
${esp_hal_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_utility.c
98+
${esp_hal_dir}/components/log/log_noos.c
99+
${src_dir}/bootloader_banner.c
56100
${src_dir}/bootloader_wdt.c
57-
${src_dir}/secure_boot.c
58-
${src_dir}/flash_encrypt.c
59-
${src_dir}/${MCUBOOT_TARGET}/bootloader_init.c
60-
${esp_idf_dir}/components/hal/mpu_hal.c
61-
${esp_idf_dir}/components/hal/soc_hal.c
62-
${esp_idf_dir}/components/soc/${MCUBOOT_TARGET}/uart_periph.c
63-
${esp_idf_dir}/components/soc/${MCUBOOT_TARGET}/gpio_periph.c
64-
${esp_idf_dir}/components/bootloader_support/src/bootloader_common_loader.c
65-
${esp_idf_dir}/components/bootloader_support/src/bootloader_console.c
66-
${esp_idf_dir}/components/bootloader_support/src/bootloader_console_loader.c
67-
${esp_idf_dir}/components/bootloader_support/src/bootloader_flash.c
68-
${esp_idf_dir}/components/bootloader_support/src/bootloader_flash_config_${MCUBOOT_TARGET}.c
69-
${esp_idf_dir}/components/bootloader_support/src/bootloader_clock_init.c
70-
${esp_idf_dir}/components/bootloader_support/src/bootloader_efuse_${MCUBOOT_TARGET}.c
71-
${esp_idf_dir}/components/bootloader_support/src/bootloader_panic.c
72-
${esp_idf_dir}/components/bootloader_support/src/bootloader_mem.c
73-
${esp_idf_dir}/components/bootloader_support/src/bootloader_random.c
74-
${esp_idf_dir}/components/bootloader_support/src/bootloader_random_${MCUBOOT_TARGET}.c
75-
${esp_idf_dir}/components/bootloader_support/src/bootloader_utility.c
76-
${esp_idf_dir}/components/bootloader_support/src/esp_image_format.c
77-
${esp_idf_dir}/components/bootloader_support/src/secure_boot_v2/secure_boot_signatures_bootloader.c
78-
${esp_idf_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_soc.c
79-
${esp_idf_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/bootloader_sha.c
80-
${esp_idf_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/secure_boot_secure_features.c
81-
${esp_idf_dir}/components/bootloader_support/src/${MCUBOOT_TARGET}/flash_encryption_secure_features.c
82-
${esp_idf_dir}/components/spi_flash/${MCUBOOT_TARGET}/spi_flash_rom_patch.c
83-
${esp_idf_dir}/components/esp_hw_support/esp_clk.c
84-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c
85-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_time.c
86-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk.c
87-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk_init.c
88-
${esp_idf_dir}/components/hal/wdt_hal_iram.c
89-
${esp_idf_dir}/components/esp_hw_support/cpu_util.c
90-
${esp_idf_dir}/components/esp_rom/patches/esp_rom_uart.c
91-
${esp_idf_dir}/components/esp_rom/patches/esp_rom_sys.c
92-
${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_table.c
93-
${esp_idf_dir}/components/efuse/src/esp_efuse_fields.c
94-
${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_fields.c
95-
${esp_idf_dir}/components/efuse/src/esp_efuse_api.c
96-
${esp_idf_dir}/components/efuse/src/esp_efuse_utility.c
97-
${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/esp_efuse_utility.c
98101
)
99102

103+
if(DEFINED CONFIG_SECURE_BOOT_V2_ENABLED)
104+
list(APPEND hal_srcs
105+
${src_dir}/secure_boot.c
106+
)
107+
endif()
108+
109+
if(DEFINED CONFIG_SECURE_FLASH_ENC_ENABLED)
110+
list(APPEND hal_srcs
111+
${src_dir}/flash_encrypt.c
112+
)
113+
endif()
114+
100115
if("${MCUBOOT_ARCH}" STREQUAL "xtensa")
101116
list(APPEND hal_srcs
102-
${esp_idf_dir}/components/esp_rom/patches/esp_rom_longjmp.S
117+
${esp_hal_dir}/components/esp_rom/patches/esp_rom_longjmp.S
103118
)
104119
endif()
105120

@@ -125,7 +140,7 @@ set(CFLAGS
125140
"-ggdb"
126141
"-Os"
127142
"-D_GNU_SOURCE"
128-
"-std=gnu99"
143+
"-std=gnu17"
129144
"-Wno-old-style-declaration"
130145
"-Wno-implicit-int"
131146
)
@@ -153,16 +168,23 @@ if("${MCUBOOT_ARCH}" STREQUAL "xtensa")
153168
endif()
154169

155170
set(LINKER_SCRIPTS
156-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.ld
157-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.libgcc.ld
158-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.api.ld
159-
-T${esp_idf_dir}/components/soc/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.peripherals.ld
171+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.ld
172+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.libgcc.ld
173+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.api.ld
174+
-T${esp_hal_dir}/components/soc/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.peripherals.ld
160175
)
161176

162177
include(${CMAKE_CURRENT_LIST_DIR}/include/${MCUBOOT_TARGET}/${MCUBOOT_TARGET}.cmake)
163178

164179
add_library(hal STATIC ${hal_srcs} ${include_dirs})
165180

181+
# Wrap for overriding the print banner function from bootloader_support
182+
add_definitions(-DIDF_VER=0)
183+
target_link_libraries(
184+
hal
185+
INTERFACE
186+
"-Wl,--wrap=bootloader_print_banner")
187+
166188
target_include_directories(
167189
hal
168190
PUBLIC

‎boot/espressif/hal/esp-idf

-1
This file was deleted.

‎boot/espressif/hal/include/bootloader_wdt.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
#pragma once
77

88
void bootloader_wdt_feed(void);
9-
void bootloader_config_wdt(void);

‎boot/espressif/hal/include/esp32/esp32.cmake

+17-7
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,31 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
list(APPEND include_dirs
6-
${esp_idf_dir}/components/${MCUBOOT_TARGET}/include
7-
)
8-
95
list(APPEND hal_srcs
10-
${esp_idf_dir}/components/efuse/src/esp_efuse_api_key_esp32.c
6+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c
7+
${esp_hal_dir}/components/efuse/src/efuse_controller/keys/without_key_purposes/three_key_blocks/esp_efuse_api_key.c
118
)
129

1310
if (DEFINED CONFIG_ESP_MULTI_PROCESSOR_BOOT)
1411
list(APPEND hal_srcs
1512
${src_dir}/${MCUBOOT_TARGET}/app_cpu_start.c
13+
${esp_hal_dir}/components/esp_hw_support/cpu.c
14+
)
15+
endif()
16+
17+
if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
18+
list(APPEND hal_srcs
19+
${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
1620
)
1721
endif()
1822

1923
list(APPEND LINKER_SCRIPTS
20-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib-funcs.ld
21-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
24+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib-funcs.ld
25+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
2226
)
27+
28+
set_source_files_properties(
29+
${esp_hal_dir}/components/bootloader_support/src/esp32/bootloader_esp32.c
30+
${esp_hal_dir}/components/bootloader_support/bootloader_flash/src/bootloader_flash.c
31+
PROPERTIES COMPILE_FLAGS
32+
"-Wno-unused-variable -Wno-unused-but-set-variable")

‎boot/espressif/hal/include/esp32/sdkconfig.h

+9
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,17 @@
88
#define CONFIG_IDF_FIRMWARE_CHIP_ID 0x0000
99
#define CONFIG_IDF_TARGET_ESP32 1
1010
#define CONFIG_ESP32_REV_MIN_3 1
11+
#define CONFIG_ESP32_REV_MIN_FULL 300
12+
#define CONFIG_ESP_REV_MIN_FULL CONFIG_ESP32_REV_MIN_FULL
1113
#define CONFIG_ESP32_REV_MIN 3
14+
#define CONFIG_ESP32_REV_MAX_FULL 399
15+
#define CONFIG_ESP_REV_MAX_FULL CONFIG_ESP32_REV_MAX_FULL
1216
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
17+
#define CONFIG_MMU_PAGE_SIZE 0x10000
1318
#define CONFIG_ESP32_XTAL_FREQ 40
19+
#define CONFIG_XTAL_FREQ 40
20+
#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 1
21+
#define CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ 160
1422
#define CONFIG_MCUBOOT 1
1523
#define NDEBUG 1
1624
#define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
@@ -20,3 +28,4 @@
2028
#define CONFIG_EFUSE_VIRTUAL_OFFSET 0x250000
2129
#define CONFIG_EFUSE_VIRTUAL_SIZE 0x2000
2230
#define CONFIG_EFUSE_MAX_BLK_LEN 192
31+
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1

‎boot/espressif/hal/include/esp32c3/esp32c3.cmake

+11-10
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
# SPDX-License-Identifier: Apache-2.0
44

55
list(APPEND hal_srcs
6-
${esp_idf_dir}/components/bootloader_support/src/flash_qio_mode.c
7-
${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/cpu_util_esp32c3.c
8-
${esp_idf_dir}/components/efuse/src/esp_efuse_api_key_esp32xx.c
6+
${esp_hal_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c
7+
${esp_hal_dir}/components/hal/cache_hal.c
8+
${esp_hal_dir}/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c
99
)
1010

11+
if (DEFINED CONFIG_ESP_CONSOLE_UART_CUSTOM)
12+
list(APPEND hal_srcs
13+
${src_dir}/${MCUBOOT_TARGET}/console_uart_custom.c
14+
)
15+
endif()
16+
1117
list(APPEND LINKER_SCRIPTS
12-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
13-
-T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
18+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib.ld
19+
-T${esp_hal_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.eco3.ld
1420
)
15-
16-
set_source_files_properties(
17-
${esp_idf_dir}/components/bootloader_support/src/flash_qio_mode.c
18-
PROPERTIES COMPILE_FLAGS
19-
"-Wno-unused-variable")

0 commit comments

Comments
 (0)