commit b794d335a490fa8b3076078777bacc3fa9537317
author Sylvio Alves <sylvio.alves@espressif.com> Mon Mar 04 10:08:30 2024 -0300
committer almir-okato <66885489+almir-okato@users.noreply.github.com> Mon Mar 04 15:47:01 2024 -0300
tree 26a3097da568029c5659bd1a56019fe3eb465ff0
parent fefe701a5de7ffcec001938c978ef57ff7d0592d

espressif: modify SOC_FAMILY according to new HWMv2

Update FAMILY reference as needed.

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index c6a0f74..204c430 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -42,7 +42,7 @@
 #include "flash_map_backend/flash_map_backend.h"
 
 /* Check if Espressif target is supported */
-#ifdef CONFIG_SOC_FAMILY_ESP32
+#ifdef CONFIG_SOC_FAMILY_ESPRESSIF_ESP32
 
 #include <bootloader_init.h>
 #include <esp_loader.h>
@@ -63,7 +63,7 @@
 #define IMAGE1_PRIMARY_SIZE \
           DT_PROP_BY_IDX(DT_NODE_BY_FIXED_PARTITION_LABEL(image_1), reg, 1)
 
-#endif /* CONFIG_SOC_FAMILY_ESP32 */
+#endif /* CONFIG_SOC_FAMILY_ESPRESSIF_ESP32 */
 
 #ifdef CONFIG_MCUBOOT_SERIAL
 #include "boot_serial/boot_serial.h"
@@ -225,7 +225,7 @@
 
 #elif defined(CONFIG_XTENSA) || defined(CONFIG_RISCV)
 
-#ifndef CONFIG_SOC_FAMILY_ESP32
+#ifndef CONFIG_SOC_FAMILY_ESPRESSIF_ESP32
 
 #define SRAM_BASE_ADDRESS	0xBE030000
 
@@ -254,7 +254,7 @@
 done:
     flash_area_close(fap);
 }
-#endif /* !CONFIG_SOC_FAMILY_ESP32 */
+#endif /* !CONFIG_SOC_FAMILY_ESPRESSIF_ESP32 */
 
 /* Entry point (.ResetVector) is at the very beginning of the image.
  * Simply copy the image to a suitable location and jump there.
@@ -266,7 +266,7 @@
     BOOT_LOG_INF("br_image_off = 0x%x\n", rsp->br_image_off);
     BOOT_LOG_INF("ih_hdr_size = 0x%x\n", rsp->br_hdr->ih_hdr_size);
 
-#ifdef CONFIG_SOC_FAMILY_ESP32
+#ifdef CONFIG_SOC_FAMILY_ESPRESSIF_ESP32
     int slot = (rsp->br_image_off == IMAGE0_PRIMARY_START_ADDRESS) ?
                 PRIMARY_SLOT : SECONDARY_SLOT;
     /* Load memory segments and start from entry point */
@@ -278,7 +278,7 @@
     /* Jump to entry point */
     start = (void *)(SRAM_BASE_ADDRESS + rsp->br_hdr->ih_hdr_size);
     ((void (*)(void))start)();
-#endif /* CONFIG_SOC_FAMILY_ESP32 */
+#endif /* CONFIG_SOC_FAMILY_ESPRESSIF_ESP32 */
 }
 
 #else