esp_common: simplify component build script

components/esp_common/CMakeLists.txt

@@ -1,28 +1,16 @@
 idf_build_get_property(target IDF_TARGET)
 
+list(APPEND srcs "src/esp_err_to_name.c")
 
-if(BOOTLOADER_BUILD)
+# Note: esp_ipc, esp_pm added as a public requirement to keep compatibility as to be located here.
-    # For bootloader, all we need from esp_common is headers
+idf_component_register(SRCS "${srcs}"
-    idf_component_register(SRCS ${srcs}
                         INCLUDE_DIRS include
-                           PRIV_REQUIRES soc)
+                        REQUIRES ${target})
-    set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-Wl,--gc-sections")
-else()
-    # Regular app build
-    list(APPEND srcs "src/esp_err_to_name.c")
 
-    # Note: esp_ipc, esp_pm added as a public requirement to keep compatibility as to be located here.
+set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 4)
-    idf_component_register(SRCS "${srcs}"
-                           INCLUDE_DIRS include
-                           REQUIRES ${target} espcoredump esp_timer esp_ipc esp_pm esp_hw_support
-                           PRIV_REQUIRES soc)
 
-    set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY LINK_LIBRARIES "-Wl,--gc-sections")
+# List of components needed for the error codes list
-    set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-Wl,--gc-sections")
+set(optional_reqs ulp
-    set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY LINK_INTERFACE_MULTIPLICITY 4)
-
-    # List of components needed for the error codes list
-    set(optional_reqs ulp
                     efuse
                     esp_http_client
                     esp_http_server
@@ -40,17 +28,10 @@ else()
                     esp-tls
                     esp_https_ota)
 
-    idf_build_get_property(build_components BUILD_COMPONENTS)
+idf_build_get_property(build_components BUILD_COMPONENTS)
-    foreach(req ${optional_reqs})
+foreach(req ${optional_reqs})
     if(req IN_LIST build_components)
         idf_component_get_property(req_lib ${req} COMPONENT_LIB)
         target_link_libraries(${COMPONENT_LIB} PRIVATE ${req_lib})
     endif()
-    endforeach()
+endforeach()
-
-endif()
-
-if(CONFIG_IDF_ENV_FPGA)
-    # Forces the linker to include fpga stubs from this component
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u esp_common_include_fpga_overrides")
-endif()

components/esp_system/CMakeLists.txt

@@ -1,13 +1,16 @@
-if(BOOTLOADER_BUILD)
-    # Bootloader relies on some Kconfig options defined in esp_system.
-    idf_component_register()
-    return()
-endif()
-
 idf_build_get_property(target IDF_TARGET)
 
-# Remove when sleep is brought up on master for C3 TODO ESP32-C3 IDF-2571
+set(srcs)
-set(srcs "esp_err.c"
+
+if(CONFIG_IDF_ENV_FPGA)
+    list(APPEND srcs "fpga_overrides.c")
+endif()
+
+if(BOOTLOADER_BUILD)
+    # Bootloader relies on some Kconfig options defined in esp_system.
+    idf_component_register(SRCS "${srcs}")
+else()
+    list(APPEND srcs "esp_err.c"
             "freertos_hooks.c"
             "intr_alloc.c"
             "int_wdt.c"
@@ -20,15 +23,11 @@ set(srcs "esp_err.c"
             "sleep_modes.c"
             "task_wdt.c")
 
-if(NOT (${target} STREQUAL "esp32c3") )
+    if(NOT (${target} STREQUAL "esp32c3") )
         list(APPEND srcs  "dbg_stubs.c")
-endif()
+    endif()
 
-if(CONFIG_IDF_ENV_FPGA)
+    idf_component_register(SRCS "${srcs}"
-    list(APPEND srcs "fpga_overrides.c")
-endif()
-
-idf_component_register(SRCS "${srcs}"
                         INCLUDE_DIRS include
                         PRIV_REQUIRES spi_flash
                                     # [refactor-todo] requirements due to init code,
@@ -37,28 +36,28 @@ idf_component_register(SRCS "${srcs}"
                                     esp_pm app_update nvs_flash pthread app_trace esp_gdbstub esp_ipc
                                     espcoredump
                         LDFRAGMENTS "linker.lf")
-add_subdirectory(port)
+    add_subdirectory(port)
 
+    # After system initialization, `start_app` (and its other cores variant) is called.
+    # This is provided by the user or from another component. Since we can't establish
+    # dependency on what we don't know, force linker to not drop the symbol regardless
+    # of link line order.
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-u start_app")
 
-# After system initialization, `start_app` (and its other cores variant) is called.
+    if(NOT CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE)
-# This is provided by the user or from another component. Since we can't establish
-# dependency on what we don't know, force linker to not drop the symbol regardless
-# of link line order.
-target_link_libraries(${COMPONENT_LIB} INTERFACE "-u start_app")
-
-if(NOT CONFIG_ESP_SYSTEM_SINGLE_CORE_MODE)
         target_link_libraries(${COMPONENT_LIB} INTERFACE "-u start_app_other_cores")
-endif()
+    endif()
 
-# Disable stack protection in files which are involved in initialization of that feature
+    # Disable stack protection in files which are involved in initialization of that feature
-set_source_files_properties(
+    set_source_files_properties(
         "startup.c" "stack_check.c"
         PROPERTIES COMPILE_FLAGS
         -fno-stack-protector)
 
-if(NOT CMAKE_BUILD_EARLY_EXPANSION)
+    if(NOT CMAKE_BUILD_EARLY_EXPANSION)
         set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/sleep_modes.c" PROPERTIES
                                     COMPILE_FLAGS "-fno-jump-tables -fno-tree-switch-conversion")
+    endif()
 endif()
 
 if(CONFIG_IDF_ENV_FPGA)

components/esp_system/component.mk

@@ -1,5 +1,12 @@
 ifdef IS_BOOTLOADER_BUILD
+
+ifndef CONFIG_IDF_ENV_FPGA
 COMPONENT_CONFIG_ONLY := 1
+else
+COMPONENT_SRCDIRS := .
+COMPONENT_OBJS += fpga_overrides.o
+endif
+
 else
 SOC_NAME := $(IDF_TARGET)
 
@@ -8,6 +15,10 @@ COMPONENT_ADD_INCLUDEDIRS := include
 COMPONENT_PRIV_INCLUDEDIRS := port/include port
 COMPONENT_ADD_LDFRAGMENTS += linker.lf
 
+ifndef CONFIG_IDF_ENV_FPGA
+COMPONENT_OBJEXCLUDE += fpga_overrides.o
+endif
+
 include $(COMPONENT_PATH)/port/soc/$(SOC_NAME)/component.mk
 
 # disable stack protection in files which are involved in initialization of that feature

tools/cmake/build.cmake

@@ -112,10 +112,13 @@ function(__build_set_default_build_specifications)
 
     list(APPEND cxx_compile_options "-std=gnu++11")
 
+    list(APPEND link_options "-Wl,--gc-sections")
+
     idf_build_set_property(COMPILE_DEFINITIONS "${compile_definitions}" APPEND)
     idf_build_set_property(COMPILE_OPTIONS "${compile_options}" APPEND)
     idf_build_set_property(C_COMPILE_OPTIONS "${c_compile_options}" APPEND)
     idf_build_set_property(CXX_COMPILE_OPTIONS "${cxx_compile_options}" APPEND)
+    idf_build_set_property(LINK_OPTIONS "${link_options}" APPEND)
 endfunction()
 
 #