commit 2f17549ef3f1378f28050e1dffec974dc02e3172
author Almir Okato <almir.okato@espressif.com> Wed Aug 02 00:51:15 2023 -0300
committer David Brown <davidb@davidb.org> Thu Aug 10 10:59:33 2023 -0700
tree e16117ae525e93fea3cb6563591031dfdd251a03
parent fc658eb5a22b7b1721c3b7d0853a7115fae08939

espressif: esp32c6 esp32h2: fix custom uart and secure boot build

Fix missing header on console_uart_custom.c
Update secure_boot.c includes removing soc ifdefs

Signed-off-by: Almir Okato <almir.okato@espressif.com>

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

diff --git a/boot/espressif/hal/include/esp32c6/esp32c6.cmake b/boot/espressif/hal/include/esp32c6/esp32c6.cmake
index 9160eab..23b6b00 100644
--- a/boot/espressif/hal/include/esp32c6/esp32c6.cmake
+++ b/boot/espressif/hal/include/esp32c6/esp32c6.cmake
@@ -8,6 +8,7 @@
 
 list(APPEND hal_srcs
     ${esp_hal_dir}/components/hal/cache_hal.c
+    ${esp_hal_dir}/components/hal/${MCUBOOT_TARGET}/lp_timer_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
 )

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

diff --git a/boot/espressif/hal/src/esp32c6/console_uart_custom.c b/boot/espressif/hal/src/esp32c6/console_uart_custom.c
index 214c60f..da5c1ab 100644
--- a/boot/espressif/hal/src/esp32c6/console_uart_custom.c
+++ b/boot/espressif/hal/src/esp32c6/console_uart_custom.c
@@ -7,6 +7,7 @@
 #include <esp_rom_uart.h>
 #include <hal/uart_ll.h>
 #include <soc/uart_periph.h>
+#include <esp_attr.h>
 
 #if CONFIG_ESP_CONSOLE_UART_CUSTOM
 static uart_dev_t *alt_console_uart_dev = (CONFIG_ESP_CONSOLE_UART_NUM == 0) ?

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

diff --git a/boot/espressif/hal/src/esp32h2/console_uart_custom.c b/boot/espressif/hal/src/esp32h2/console_uart_custom.c
index e006709..ee80d6b 100644
--- a/boot/espressif/hal/src/esp32h2/console_uart_custom.c
+++ b/boot/espressif/hal/src/esp32h2/console_uart_custom.c
@@ -7,6 +7,7 @@
 #include <esp_rom_uart.h>
 #include <hal/uart_ll.h>
 #include <soc/uart_periph.h>
+#include <esp_attr.h>
 
 #if CONFIG_ESP_CONSOLE_UART_CUSTOM
 static uart_dev_t *alt_console_uart_dev = (CONFIG_ESP_CONSOLE_UART_NUM == 0) ?

boot/espressif/hal/src/secure_boot.c

diff --git a/boot/espressif/hal/src/secure_boot.c b/boot/espressif/hal/src/secure_boot.c
index 5c6a475..f724f0e 100644
--- a/boot/espressif/hal/src/secure_boot.c
+++ b/boot/espressif/hal/src/secure_boot.c
@@ -14,22 +14,7 @@
 #include "esp_image_format.h"
 #include "esp_efuse.h"
 #include "esp_efuse_table.h"
-
-#if CONFIG_IDF_TARGET_ESP32
-#include "esp32/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32H4
-#include "esp32h4/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32C2
-#include "esp32c2/rom/secure_boot.h"
-#elif CONFIG_IDF_TARGET_ESP32C6
-#include "esp32c6/rom/secure_boot.h"
-#endif
+#include "rom/secure_boot.h"
 
 /* The following API implementations are used only when called
  * from the bootloader code.