Просмотр исходного кода

Merge branch 'bugfix/fix_c3_typos' into 'master'

esp32c3: fix typos of c3 path

See merge request espressif/esp-idf!13318
Angus Gratton 4 лет назад
Родитель
Сommit
69309c88a0
2 измененных файлов с 6 добавлено и 9 удалено
  1. 1 1
      components/esp_hw_support/sleep_modes.c
  2. 5 8
      components/esp_system/port/cpu_start.c

+ 1 - 1
components/esp_hw_support/sleep_modes.c

@@ -68,7 +68,7 @@
 #include "soc/extmem_reg.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #include "esp32c3/clk.h"
-#include "esp32s3/rom/cache.h"
+#include "esp32c3/rom/cache.h"
 #include "esp32c3/rom/rtc.h"
 #include "soc/extmem_reg.h"
 #include "esp_heap_caps.h"

+ 5 - 8
components/esp_system/port/cpu_start.c

@@ -56,7 +56,7 @@
 #include "soc/system_reg.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
 #include "esp32c3/rtc.h"
-#include "esp32s3/rom/cache.h"
+#include "esp32c3/rom/cache.h"
 #include "esp32c3/rom/rtc.h"
 #include "soc/cache_memory.h"
 #include "esp32c3/memprot.h"
@@ -85,16 +85,13 @@
 #if CONFIG_APP_BUILD_TYPE_ELF_RAM
 #if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/spi_flash.h"
-#endif // CONFIG_IDF_TARGET_ESP32
-#if CONFIG_IDF_TARGET_ESP32S2
+#elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/spi_flash.h"
-#endif // CONFIG_IDF_TARGET_ESP32S2
-#if CONFIG_IDF_TARGET_ESP32S3
+#elif CONFIG_IDF_TARGET_ESP32S3
 #include "esp32s3/rom/spi_flash.h"
-#endif // CONFIG_IDF_TARGET_ESP32S3
-#if CONFIG_IDF_TARGET_ESP32C3
+#elif CONFIG_IDF_TARGET_ESP32C3
 #include "esp32c3/rom/spi_flash.h"
-#endif // CONFIG_IDF_TARGET_ESP32C3
+#endif
 #endif // CONFIG_APP_BUILD_TYPE_ELF_RAM
 
 // Set efuse ROM_LOG_MODE on first boot