Merge branch 'bugfix/move_rtc_hal_from_soc' into 'master'

Move leftover hal files in soc

See merge request espressif/esp-idf!10497

components/hal/CMakeLists.txt

@@ -53,6 +53,7 @@ if(NOT BOOTLOADER_BUILD)
                     "esp32s2/cp_dma_hal.c"
                     "esp32s2/systimer_hal.c"
                     "esp32s2/touch_sensor_hal.c"
+                    "esp32s2/dac_hal.c"
                     "esp32s2/usb_hal.c")
     endif()
 

components/hal/test/CMakeLists.txt

@@ -0,0 +1,3 @@
+idf_component_register(SRC_DIRS "."
+                    PRIV_INCLUDE_DIRS "${include_dirs}"
+                    PRIV_REQUIRES cmock test_utils)

components/hal/test/component.mk

@@ -0,0 +1,5 @@
+COMPONENT_SRCDIRS := .
+
+COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
+
+

components/soc/CMakeLists.txt

@@ -6,16 +6,11 @@ idf_component_register(SRCS "src/cpu_util.c"
                             "src/soc_include_legacy_warn.c"
                             "src/compare_set.c"
                        REQUIRES hal #cpu.h directly includes HAL header
+                       INCLUDE_DIRS include
                        PRIV_REQUIRES ${target}
                        LDFRAGMENTS linker.lf)
 
-
-# Since there can be chip-specific HAL headers which can include the common
-# HAL header via include_next, process the build scripts here first so that
-# include directories appear first in the compile command.
-add_subdirectory(src/${target})
-target_include_directories(${COMPONENT_LIB} PUBLIC include)
-target_link_libraries(${COMPONENT_LIB} PRIVATE idf::hal)
-
 add_subdirectory(soc)
+
+add_subdirectory(src/${target})
 target_link_libraries(${COMPONENT_LIB} PUBLIC "soc_${target}")

components/soc/src/esp32s2/CMakeLists.txt

@@ -1,5 +1,4 @@
 set(srcs
-        "dac_hal.c"
         "rtc_clk.c"
         "rtc_clk_init.c"
         "rtc_init.c"