mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-10 04:43:33 +00:00
Merge branch 'contrib/github_pr_12481' into 'master'
Many places in the ESP_SYSTEM are using CONFIG_FREERTOS_UNICORE instead of CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE (GitHub PR) Closes IDFGH-11333 See merge request espressif/esp-idf!27435
This commit is contained in:
@@ -18,7 +18,7 @@ void cache_hal_suspend(uint32_t cache_level, cache_type_t type)
|
||||
{
|
||||
s_cache_status[0] = cache_ll_l1_get_enabled_bus(0);
|
||||
cache_ll_l1_disable_cache(0);
|
||||
#if !CONFIG_FREERTOS_UNICORE
|
||||
#if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
|
||||
s_cache_status[1] = cache_ll_l1_get_enabled_bus(1);
|
||||
cache_ll_l1_disable_cache(1);
|
||||
#endif
|
||||
@@ -29,7 +29,7 @@ void cache_hal_resume(uint32_t cache_level, cache_type_t type)
|
||||
{
|
||||
cache_ll_l1_enable_cache(0);
|
||||
cache_ll_l1_enable_bus(0, s_cache_status[0]);
|
||||
#if !CONFIG_FREERTOS_UNICORE
|
||||
#if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
|
||||
cache_ll_l1_enable_cache(1);
|
||||
cache_ll_l1_enable_bus(1, s_cache_status[1]);
|
||||
#endif
|
||||
@@ -39,7 +39,7 @@ void cache_hal_resume(uint32_t cache_level, cache_type_t type)
|
||||
bool cache_hal_is_cache_enabled(uint32_t cache_level, cache_type_t type)
|
||||
{
|
||||
bool result = cache_ll_l1_is_cache_enabled(0, CACHE_TYPE_ALL);
|
||||
#if !CONFIG_FREERTOS_UNICORE
|
||||
#if !CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE
|
||||
result = result && cache_ll_l1_is_cache_enabled(1, CACHE_TYPE_ALL);
|
||||
#endif
|
||||
return result;
|
||||
|
Reference in New Issue
Block a user