Add missing file type for esp32 binary. (aws#1550)

* Applied Espressif elf suffix patch.

Author: lundinc2

vendors/espressif/boards/esp32/CMakeLists.txt

@@ -1,3 +1,5 @@
+set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+
 # -------------------------------------------------------------------------------------------------
 # Amazon FreeRTOS Console metadata
 # -------------------------------------------------------------------------------------------------
@@ -63,6 +65,8 @@ target_link_options(
     INTERFACE ${linker_flags}
 )
 
+set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+
 # -------------------------------------------------------------------------------------------------
 # Amazon FreeRTOS portable layers
 # -------------------------------------------------------------------------------------------------

vendors/espressif/esp-idf/components/bootloader/subproject/CMakeLists.txt

@@ -19,21 +19,21 @@ set(COMPONENT_REQUIRES_COMMON log esp32 soc)
 include("${IDF_PATH}/tools/cmake/project.cmake")
 project(bootloader)
 
-target_linker_script(bootloader.elf
+target_linker_script(bootloader
     "main/esp32.bootloader.ld"
     "main/esp32.bootloader.rom.ld"
 )
 
 # as cmake won't attach linker args to a header-only library, attach
-# linker args directly to the bootloader.elf
+# linker args directly to the bootloader
 set(ESP32_BOOTLOADER_LINKER_SCRIPTS
     "${IDF_PATH}/components/esp32/ld/esp32.rom.ld"
     "${IDF_PATH}/components/esp32/ld/esp32.rom.spiram_incompatible_fns.ld"
     "${IDF_PATH}/components/esp32/ld/esp32.peripherals.ld")
 
-target_linker_script(bootloader.elf ${ESP32_BOOTLOADER_LINKER_SCRIPTS})
+target_linker_script(bootloader ${ESP32_BOOTLOADER_LINKER_SCRIPTS})
 
-target_link_libraries(bootloader.elf gcc)
+target_link_libraries(bootloader gcc)
 
 set(secure_boot_signing_key ${SECURE_BOOT_SIGNING_KEY})
 

vendors/espressif/esp-idf/components/esptool_py/project_include.cmake

@@ -84,7 +84,7 @@ endif()
 #
 add_custom_command(OUTPUT "${IDF_BUILD_ARTIFACTS_DIR}/${unsigned_project_binary}"
     COMMAND ${ESPTOOLPY} elf2image ${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS} ${ESPTOOLPY_ELF2IMAGE_OPTIONS}
-        -o "${IDF_BUILD_ARTIFACTS_DIR}/${unsigned_project_binary}" "${IDF_PROJECT_EXECUTABLE}"
+        -o "${IDF_BUILD_ARTIFACTS_DIR}/${unsigned_project_binary}" "$<TARGET_FILE:${IDF_PROJECT_EXECUTABLE}>"
     DEPENDS ${IDF_PROJECT_EXECUTABLE}
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -106,11 +106,7 @@ if(NOT BOOTLOADER_BUILD AND
         )
 endif()
 
-if(NOT BOOTLOADER_BUILD)
-    add_custom_target(app ALL DEPENDS "${IDF_BUILD_ARTIFACTS_DIR}/${IDF_PROJECT_BIN}")
-else()
-    add_custom_target(bootloader ALL DEPENDS "${IDF_BUILD_ARTIFACTS_DIR}/${IDF_PROJECT_BIN}")
-endif()
+add_custom_target(app ALL DEPENDS "${IDF_BUILD_ARTIFACTS_DIR}/${IDF_PROJECT_BIN}")
 
 if(NOT BOOTLOADER_BUILD AND
     CONFIG_SECURE_BOOT_ENABLED AND

vendors/espressif/esp-idf/tools/cmake/idf_functions.cmake

@@ -408,8 +408,18 @@ macro(idf_import_components var idf_path build_path)
         # Write project description JSON file
         make_json_list("${BUILD_COMPONENTS}" build_components_json)
         make_json_list("${BUILD_COMPONENT_PATHS}" build_component_paths_json)
+
         configure_file("${IDF_PATH}/tools/cmake/project_description.json.in"
+            "${IDF_BUILD_ARTIFACTS_DIR}/project_description.json.in")
+
+        file(GENERATE OUTPUT "${IDF_BUILD_ARTIFACTS_DIR}/project_description.json"
+            INPUT "${IDF_BUILD_ARTIFACTS_DIR}/project_description.json.in")
+
+        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY
+            ADDITIONAL_MAKE_CLEAN_FILES
+            "${IDF_BUILD_ARTIFACTS_DIR}/project_description.json.in"
             "${IDF_BUILD_ARTIFACTS_DIR}/project_description.json")
+
         unset(build_components_json)
         unset(build_component_paths_json)
     endif()

vendors/espressif/esp-idf/tools/cmake/project.cmake

@@ -94,8 +94,10 @@ macro(project name)
 
     __project(${name} C CXX ASM)
 
+    set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+
     set(IDF_BUILD_ARTIFACTS ON)
-    set(IDF_PROJECT_EXECUTABLE ${CMAKE_PROJECT_NAME}.elf)
+    set(IDF_PROJECT_EXECUTABLE ${CMAKE_PROJECT_NAME})
     set(IDF_BUILD_ARTIFACTS_DIR ${CMAKE_BINARY_DIR})
 
     if(MAIN_SRCS)

vendors/espressif/esp-idf/tools/cmake/project_description.json.in

@@ -4,7 +4,7 @@
     "build_dir":          "${IDF_BUILD_ARTIFACTS_DIR}",
     "config_file":        "${SDKCONFIG}",
     "config_defaults":    "${IDF_SDKCONFIG_DEFAULTS}",
-    "app_elf":            "${IDF_PROJECT_EXECUTABLE}",
+    "app_elf":            "$<TARGET_FILE_NAME:${IDF_PROJECT_EXECUTABLE}>",
     "app_bin":            "${IDF_PROJECT_BIN}",
     "git_revision":       "${IDF_VER}",
     "phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}",