From 9d6366f290f8059a7903939857266e9f11ef719b Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Thu, 15 Jul 2021 14:55:15 +1000 Subject: [PATCH] esp_hw_support: Move rtc.h header from target components --- components/esp32c3/CMakeLists.txt | 3 +-- components/esp32h2/CMakeLists.txt | 3 +-- components/esp32s2/CMakeLists.txt | 3 +-- components/esp32s3/CMakeLists.txt | 3 +-- .../{esp32/include => esp_hw_support/include/soc}/esp32/rtc.h | 0 .../include => esp_hw_support/include/soc}/esp32c3/rtc.h | 0 .../include => esp_hw_support/include/soc}/esp32h2/rtc.h | 0 .../include => esp_hw_support/include/soc}/esp32s2/rtc.h | 0 .../include => esp_hw_support/include/soc}/esp32s3/rtc.h | 0 9 files changed, 4 insertions(+), 8 deletions(-) rename components/{esp32/include => esp_hw_support/include/soc}/esp32/rtc.h (100%) rename components/{esp32c3/include => esp_hw_support/include/soc}/esp32c3/rtc.h (100%) rename components/{esp32h2/include => esp_hw_support/include/soc}/esp32h2/rtc.h (100%) rename components/{esp32s2/include => esp_hw_support/include/soc}/esp32s2/rtc.h (100%) rename components/{esp32s3/include => esp_hw_support/include/soc}/esp32s3/rtc.h (100%) diff --git a/components/esp32c3/CMakeLists.txt b/components/esp32c3/CMakeLists.txt index a0577f4dcd..fa6658cc0d 100644 --- a/components/esp32c3/CMakeLists.txt +++ b/components/esp32c3/CMakeLists.txt @@ -9,8 +9,7 @@ if(NOT BOOTLOADER_BUILD) set(legacy_reqs driver efuse soc) endif() -idf_component_register(INCLUDE_DIRS include - REQUIRES riscv "${legacy_reqs}" +idf_component_register(REQUIRES riscv "${legacy_reqs}" REQUIRED_IDF_TARGETS esp32c3) target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32c3.peripherals.ld") diff --git a/components/esp32h2/CMakeLists.txt b/components/esp32h2/CMakeLists.txt index 3c29e6a62c..58cc2fa226 100644 --- a/components/esp32h2/CMakeLists.txt +++ b/components/esp32h2/CMakeLists.txt @@ -9,8 +9,7 @@ if(NOT BOOTLOADER_BUILD) set(legacy_reqs driver efuse soc) endif() -idf_component_register(INCLUDE_DIRS include - REQUIRES riscv "${legacy_reqs}" +idf_component_register(REQUIRES riscv "${legacy_reqs}" REQUIRED_IDF_TARGETS esp32h2) target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32h2.peripherals.ld") diff --git a/components/esp32s2/CMakeLists.txt b/components/esp32s2/CMakeLists.txt index 81c68f82de..0918864d18 100644 --- a/components/esp32s2/CMakeLists.txt +++ b/components/esp32s2/CMakeLists.txt @@ -9,8 +9,7 @@ if(NOT BOOTLOADER_BUILD) set(legacy_reqs driver efuse soc) endif() -idf_component_register(INCLUDE_DIRS include - REQUIRES xtensa "${legacy_reqs}" +idf_component_register(REQUIRES xtensa "${legacy_reqs}" REQUIRED_IDF_TARGETS esp32s2) target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s2.peripherals.ld") diff --git a/components/esp32s3/CMakeLists.txt b/components/esp32s3/CMakeLists.txt index 6e30552c1a..02b509b91f 100644 --- a/components/esp32s3/CMakeLists.txt +++ b/components/esp32s3/CMakeLists.txt @@ -9,8 +9,7 @@ if(NOT BOOTLOADER_BUILD) set(legacy_reqs driver efuse soc) endif() -idf_component_register(INCLUDE_DIRS include - REQUIRES xtensa "${legacy_reqs}" +idf_component_register(REQUIRES xtensa "${legacy_reqs}" REQUIRED_IDF_TARGETS esp32s3) target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32s3.peripherals.ld") diff --git a/components/esp32/include/esp32/rtc.h b/components/esp_hw_support/include/soc/esp32/rtc.h similarity index 100% rename from components/esp32/include/esp32/rtc.h rename to components/esp_hw_support/include/soc/esp32/rtc.h diff --git a/components/esp32c3/include/esp32c3/rtc.h b/components/esp_hw_support/include/soc/esp32c3/rtc.h similarity index 100% rename from components/esp32c3/include/esp32c3/rtc.h rename to components/esp_hw_support/include/soc/esp32c3/rtc.h diff --git a/components/esp32h2/include/esp32h2/rtc.h b/components/esp_hw_support/include/soc/esp32h2/rtc.h similarity index 100% rename from components/esp32h2/include/esp32h2/rtc.h rename to components/esp_hw_support/include/soc/esp32h2/rtc.h diff --git a/components/esp32s2/include/esp32s2/rtc.h b/components/esp_hw_support/include/soc/esp32s2/rtc.h similarity index 100% rename from components/esp32s2/include/esp32s2/rtc.h rename to components/esp_hw_support/include/soc/esp32s2/rtc.h diff --git a/components/esp32s3/include/esp32s3/rtc.h b/components/esp_hw_support/include/soc/esp32s3/rtc.h similarity index 100% rename from components/esp32s3/include/esp32s3/rtc.h rename to components/esp_hw_support/include/soc/esp32s3/rtc.h