mcuboot: build MCUboot Espressif Port with Zephyr sysbuild

Skip building the hal sources from zephyr/<SOC>/CMakeLists.txt
when building MCUboot Espressif port from Zephyr's sysbuild as
it already have it's own way for integrating the Espressif hal.

Signed-off-by: Lucas Tamborrino <[email protected]>
Signed-off-by: Almir Okato <[email protected]>

Author: LucasTambor

components/bootloader_support/include/esp_flash_partitions.h

@@ -8,7 +8,9 @@
 #include "esp_err.h"
 #include "esp_types.h"
 #include "sdkconfig.h"
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include <zephyr/storage/flash_map.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,7 +40,9 @@ extern "C" {
 /* The md5sum value is found this many bytes after the ESP_PARTITION_MAGIC_MD5 offset */
 #define ESP_PARTITION_MD5_OFFSET 16
 
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #define CONFIG_BOOTLOADER_OFFSET_IN_FLASH FIXED_PARTITION_OFFSET(boot_partition)  /* Offset of bootloader image. */
+#endif
 
 /* Pre-partition table fixed flash offsets */
 #define ESP_BOOTLOADER_DIGEST_OFFSET 0x0

components/bootloader_support/src/bootloader_console_loader.c

@@ -25,8 +25,9 @@
 #include "esp32s3/rom/usb/cdc_acm.h"
 #include "esp32s3/rom/usb/usb_persist.h"
 #endif
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
-
+#endif
 #ifdef CONFIG_ESP_CONSOLE_USB_CDC
 /* The following functions replace esp_rom_uart_putc, esp_rom_uart_tx_one_char,
  * and uart_tx_one_char_uart ROM functions. The main difference is that

components/bootloader_support/src/esp32/bootloader_esp32.c

@@ -36,7 +36,9 @@
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
 #include "esp_efuse.h"
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
+#endif
 
 static const char *TAG = "boot.esp32";
 
@@ -211,7 +213,7 @@ esp_err_t bootloader_init(void)
     // print 2nd bootloader banner
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/bootloader_support/src/esp32c2/bootloader_esp32c2.c

@@ -39,7 +39,7 @@
 #include "esp_efuse.h"
 #include "hal/mmu_hal.h"
 #include "hal/cache_hal.h"
-#if !defined(CONFIG_BOOTLOADER_MCUBOOT)
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
 #endif
 
@@ -124,7 +124,7 @@ esp_err_t bootloader_init(void)
     /* print 2nd bootloader banner */
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/bootloader_support/src/esp32c3/bootloader_esp32c3.c

@@ -44,7 +44,7 @@
 #include "hal/mmu_hal.h"
 #include "hal/cache_hal.h"
 #include "hal/efuse_hal.h"
-#if !defined(CONFIG_BOOTLOADER_MCUBOOT)
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
 #endif
 
@@ -163,7 +163,7 @@ esp_err_t bootloader_init(void)
     /* print 2nd bootloader banner */
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/bootloader_support/src/esp32c6/bootloader_esp32c6.c

@@ -45,7 +45,7 @@
 #include "soc/lp_wdt_reg.h"
 #include "hal/efuse_hal.h"
 #include "modem/modem_lpcon_reg.h"
-#if !defined(CONFIG_BOOTLOADER_MCUBOOT)
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
 #endif
 
@@ -145,7 +145,7 @@ esp_err_t bootloader_init(void)
     /* print 2nd bootloader banner */
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/bootloader_support/src/esp32s2/bootloader_esp32s2.c

@@ -38,7 +38,7 @@
 #include "esp_efuse.h"
 #include "hal/mmu_hal.h"
 #include "hal/cache_hal.h"
-#if !defined(CONFIG_BOOTLOADER_MCUBOOT)
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
 #endif
 
@@ -147,7 +147,7 @@ esp_err_t bootloader_init(void)
     /* print 2nd bootloader banner */
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/bootloader_support/src/esp32s3/bootloader_esp32s3.c

@@ -40,7 +40,7 @@
 #include "hal/cache_hal.h"
 #include "xtensa/config/core.h"
 #include "xt_instr_macros.h"
-#if !defined(CONFIG_BOOTLOADER_MCUBOOT)
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "esp_flash_internal.h"
 #endif
 
@@ -181,7 +181,7 @@ esp_err_t bootloader_init(void)
     /* print 2nd bootloader banner */
     bootloader_print_banner();
 
-#ifndef CONFIG_BOOTLOADER_MCUBOOT
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     spi_flash_init_chip_state();
     if ((ret = esp_flash_init_default_chip()) != ESP_OK) {
         return ret;

components/esp_common/include/esp_compiler.h

@@ -6,7 +6,9 @@
 
 #pragma once
 
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include <zephyr/toolchain.h>
+#endif
 
 /*
  * Utility macros used for designated initializers, which work differently

components/esp_hw_support/include/esp_cpu.h

@@ -6,7 +6,9 @@
 
 #pragma once
 
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include <zephyr/kernel.h>
+#endif
 
 #include "sdkconfig.h"
 #include <stdbool.h>
@@ -373,7 +375,11 @@ FORCE_INLINE_ATTR void *esp_cpu_intr_get_handler_arg(int intr_num)
 FORCE_INLINE_ATTR void esp_cpu_intr_enable(uint32_t intr_mask)
 {
 #ifdef __XTENSA__
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     z_xt_ints_on(intr_mask);
+#else
+    xt_ints_on(intr_mask);
+#endif
 #else
     rv_utils_intr_enable(intr_mask);
 #endif
@@ -387,7 +393,11 @@ FORCE_INLINE_ATTR void esp_cpu_intr_enable(uint32_t intr_mask)
 FORCE_INLINE_ATTR void esp_cpu_intr_disable(uint32_t intr_mask)
 {
 #ifdef __XTENSA__
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
     z_xt_ints_off(intr_mask);
+#else
+    xt_ints_off(intr_mask);
+#endif
 #else
     rv_utils_intr_disable(intr_mask);
 #endif

components/soc/esp32/include/soc/rtc.h

@@ -8,7 +8,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/rtc_periph.h"
 #include "soc/clk_tree_defs.h"

components/soc/esp32c2/include/soc/rtc.h

@@ -8,7 +8,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/clk_tree_defs.h"
 

components/soc/esp32c2/include/soc/soc.h

@@ -13,7 +13,9 @@
 
 #include "esp_bit_defs.h"
 #include "reg_base.h"
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 
 #define PRO_CPU_NUM (0)
 

components/soc/esp32c3/include/soc/rtc.h

@@ -8,7 +8,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/clk_tree_defs.h"
 

components/soc/esp32c6/include/soc/rtc.h

@@ -8,7 +8,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/clk_tree_defs.h"
 

components/soc/esp32s2/include/soc/rtc.h

@@ -8,7 +8,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/clk_tree_defs.h"
 

components/soc/esp32s3/include/soc/rtc.h

@@ -9,7 +9,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#ifndef CONFIG_MCUBOOT_ESPRESSIF
 #include "stubs.h"
+#endif
 #include "soc/soc.h"
 #include "soc/clk_tree_defs.h"
 

zephyr/esp32/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)

zephyr/esp32c2/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32C2)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)

zephyr/esp32c3/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32C3)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)

zephyr/esp32c6/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32C6)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)

zephyr/esp32s2/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32S2)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)

zephyr/esp32s3/CMakeLists.txt

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
+if(CONFIG_MCUBOOT_ESPRESSIF)
+  return()
+endif()
+
 if(CONFIG_SOC_SERIES_ESP32S3)
 
   zephyr_compile_options(-fstrict-volatile-bitfields)