Merge branch 'refactor/startup' into 'master'

Startup flow refactor

See merge request espressif/esp-idf!7533

Author: projectgus

components/efuse/src/esp_efuse_api.c

@@ -24,15 +24,15 @@ const static char *TAG = "efuse";
 #if defined(BOOTLOADER_BUILD)
 #define EFUSE_LOCK_ACQUIRE()
 #define EFUSE_LOCK_RELEASE()
-#define EFUSE_LOCK_ACQUIRE_RUCURSIVE()
-#define EFUSE_LOCK_RELEASE_RUCURSIVE()
+#define EFUSE_LOCK_ACQUIRE_RECURSIVE()
+#define EFUSE_LOCK_RELEASE_RECURSIVE()
 #else
 #include <sys/lock.h>
 static _lock_t s_efuse_lock;
 #define EFUSE_LOCK_ACQUIRE() _lock_acquire(&s_efuse_lock)
 #define EFUSE_LOCK_RELEASE() _lock_release(&s_efuse_lock)
-#define EFUSE_LOCK_ACQUIRE_RUCURSIVE() _lock_acquire_recursive(&s_efuse_lock)
-#define EFUSE_LOCK_RELEASE_RUCURSIVE() _lock_release_recursive(&s_efuse_lock)
+#define EFUSE_LOCK_ACQUIRE_RECURSIVE() _lock_acquire_recursive(&s_efuse_lock)
+#define EFUSE_LOCK_RELEASE_RECURSIVE() _lock_release_recursive(&s_efuse_lock)
 #endif
 
 static bool s_batch_writing_mode = false;
@@ -80,7 +80,7 @@ esp_err_t esp_efuse_read_field_cnt(const esp_efuse_desc_t* field[], size_t* out_
 // write array to EFUSE
 esp_err_t esp_efuse_write_field_blob(const esp_efuse_desc_t* field[], const void* src, size_t src_size_bits)
 {
-    EFUSE_LOCK_ACQUIRE_RUCURSIVE();
+    EFUSE_LOCK_ACQUIRE_RECURSIVE();
     esp_err_t err = ESP_OK;
     if (field == NULL || src == NULL || src_size_bits == 0) {
         err = ESP_ERR_INVALID_ARG;
@@ -100,14 +100,14 @@ esp_err_t esp_efuse_write_field_blob(const esp_efuse_desc_t* field[], const void
             esp_efuse_utility_reset();
         }
     }
-    EFUSE_LOCK_RELEASE_RUCURSIVE();
+    EFUSE_LOCK_RELEASE_RECURSIVE();
     return err;
 }
 
 // program cnt bits to "1"
 esp_err_t esp_efuse_write_field_cnt(const esp_efuse_desc_t* field[], size_t cnt)
 {
-    EFUSE_LOCK_ACQUIRE_RUCURSIVE();
+    EFUSE_LOCK_ACQUIRE_RECURSIVE();
     esp_err_t err = ESP_OK;
     if (field == NULL || cnt == 0) {
         err = ESP_ERR_INVALID_ARG;
@@ -135,7 +135,7 @@ esp_err_t esp_efuse_write_field_cnt(const esp_efuse_desc_t* field[], size_t cnt)
             esp_efuse_utility_reset();
         }
     }
-    EFUSE_LOCK_RELEASE_RUCURSIVE();
+    EFUSE_LOCK_RELEASE_RECURSIVE();
     return err;
 }
 
@@ -184,7 +184,7 @@ uint32_t esp_efuse_read_reg(esp_efuse_block_t blk, unsigned int num_reg)
 // writing efuse register.
 esp_err_t esp_efuse_write_reg(esp_efuse_block_t blk, unsigned int num_reg, uint32_t val)
 {
-    EFUSE_LOCK_ACQUIRE_RUCURSIVE();
+    EFUSE_LOCK_ACQUIRE_RECURSIVE();
     if (s_batch_writing_mode == false) {
         esp_efuse_utility_reset();
     }
@@ -198,7 +198,7 @@ esp_err_t esp_efuse_write_reg(esp_efuse_block_t blk, unsigned int num_reg, uint3
         }
         esp_efuse_utility_reset();
     }
-    EFUSE_LOCK_RELEASE_RUCURSIVE();
+    EFUSE_LOCK_RELEASE_RECURSIVE();
     return err;
 }
 

components/esp32/CMakeLists.txt

@@ -15,7 +15,6 @@ else()
         "cache_err_int.c"
         "cache_sram_mmu.c"
         "clk.c"
-        "cpu_start.c"
         "crosscore_int.c"
         "dport_access.c"
         "esp_himem.c"
@@ -48,8 +47,6 @@ else()
 
     target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp32_out.ld")
 
-    # Rely on user code to define app_main
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u app_main")
 
     if(CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY)
         # This has to be linked before esp32.project.ld

components/esp32/cache_err_int.c

@@ -23,16 +23,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include "freertos/FreeRTOS.h"
+
 #include "esp_err.h"
-#include "esp_intr_alloc.h"
 #include "esp_attr.h"
+
+#include "esp_intr_alloc.h"
 #include "soc/dport_reg.h"
+#include "hal/cpu_hal.h"
+
+#include "esp32/dport_access.h"
+#include "esp32/rom/ets_sys.h"
+
 #include "sdkconfig.h"
 
 void esp_cache_err_int_init(void)
 {
-    uint32_t core_id = xPortGetCoreID();
+    uint32_t core_id = cpu_hal_get_core_id();
     ESP_INTR_DISABLE(ETS_MEMACCESS_ERR_INUM);
 
     // We do not register a handler for the interrupt because it is interrupt