From e845c15b474963b4b0daa57669df757422e3d5ed Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Tue, 25 Jun 2024 17:51:24 +0800 Subject: [PATCH] fix(rom): update rom layout for c5 --- .../esp_rom/include/esp32c5/rom/rom_layout.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/components/esp_rom/include/esp32c5/rom/rom_layout.h b/components/esp_rom/include/esp32c5/rom/rom_layout.h index e3796e50ca..c6d9fa0481 100644 --- a/components/esp_rom/include/esp32c5/rom/rom_layout.h +++ b/components/esp_rom/include/esp32c5/rom/rom_layout.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -12,6 +12,7 @@ extern "C" { #endif +#define CORE_NUM 1 #define SUPPORT_BTDM 0 #define SUPPORT_BTBB 0 #define SUPPORT_WIFI 1 @@ -28,6 +29,10 @@ typedef struct { void *dram0_rtos_reserved_start; void *stack_sentry; void *stack; +#if (CORE_NUM == 2) + void *stack_sentry_app; + void *stack_app; +#endif #if SUPPORT_BTDM void *data_start_btdm; @@ -58,6 +63,7 @@ typedef struct { void *data_end_interface_net80211; void *bss_start_interface_net80211; void *bss_end_interface_net80211; + void *dram_start_pp; void *dram_end_pp; void *data_start_interface_pp; @@ -83,16 +89,15 @@ typedef struct { #if SUPPORT_USB_DWCOTG void *dram_start_usb_dwcotg_rom; void *dram_end_usb_dwcotg_rom; -#else - //Two reserved members are defined here, so the structure will not be broken, - //please keep in mind that there is no memory can be released between - //dram_start_usb_reserved_rom ~ dram_end_usb_reserved_rom. - void *dram_start_usb_reserved_rom; - void *dram_end_usb_reserved_rom; #endif void *dram_start_uart_rom; void *dram_end_uart_rom; + + void *eh_frame_vaddr_rom; + void *eh_frame_hdr_vaddr_rom; + + void *drom_start; } ets_rom_layout_t; extern const ets_rom_layout_t *const ets_rom_layout_p;