Skip to content

Commit 39d2225

Browse files
committed
Merge branch 'change/cleanup_deprecated_rtc_h' into 'master'
change(hw_support): removed deprecated headers: rtc.h and soc_memory_types.h Closes IDF-11951 See merge request espressif/esp-idf!40328
2 parents eb8833e + 9d48db3 commit 39d2225

File tree

15 files changed

+15
-142
lines changed

15 files changed

+15
-142
lines changed

components/esp_hw_support/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,17 @@ else()
172172
list(APPEND priv_requires "esp_system")
173173
endif()
174174

175-
set(public_include_dirs "include" "include/soc" "include/soc/${target}"
175+
set(public_include_dirs "include" "include/soc"
176176
"dma/include" "ldo/include" "debug_probe/include"
177177
"mspi_timing_tuning/include" "mspi_timing_tuning/tuning_scheme_impl/include"
178178
"power_supply/include")
179179

180+
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/include/soc/${target}")
181+
list(APPEND public_include_dirs
182+
"include/soc/${target}"
183+
)
184+
endif()
185+
180186
if(CONFIG_IDF_TARGET_ESP32H4)
181187
list(REMOVE_ITEM srcs
182188
"sleep_modes.c"

components/esp_hw_support/include/soc/esp32/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32c2/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32c3/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32c5/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32c6/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32c61/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32h2/rtc.h

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32h21/rtc.h

Lines changed: 0 additions & 32 deletions
This file was deleted.

components/esp_hw_support/include/soc/esp32h4/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)