From 8e66d389591f0a56ba1efb9c44965906f9d91130 Mon Sep 17 00:00:00 2001 From: Armando Date: Fri, 3 Nov 2023 12:05:11 +0800 Subject: [PATCH] refactor(cpu_start): move uni/multi core log later --- components/esp_system/port/cpu_start.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index 73255e1464..9896d2ccd1 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -440,17 +440,10 @@ void IRAM_ATTR call_start_cpu0(void) } #endif -#if !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP -#if CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE - ESP_EARLY_LOGI(TAG, "Unicore app"); -#else - ESP_EARLY_LOGI(TAG, "Multicore app"); -#if !SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE +#if !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP && !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE && !SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE // It helps to fix missed cache settings for other cores. It happens when bootloader is unicore. do_multicore_settings(); -#endif // !SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE #endif -#endif // !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP // When the APP is loaded into ram for execution, some hardware initialization behaviors // in the bootloader are still necessary @@ -585,6 +578,11 @@ void IRAM_ATTR call_start_cpu0(void) #endif #endif // !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP +#if CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE + ESP_EARLY_LOGI(TAG, "Unicore app"); +#else + ESP_EARLY_LOGI(TAG, "Multicore app"); +#endif bootloader_init_mem(); #if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE