Skip to content

Commit 35fdbd5

Browse files
author
mean
committed
[esp32] workish
1 parent aafdc39 commit 35fdbd5

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

ArduinoToolchainEsp32.cmake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,12 @@ set(CMAKE_ASM_COMPILER ${PLATFORM_TOOLCHAIN_PATH}/${ESP32_TOOLCHAIN_PREFIX}gcc C
4040
set(CMAKE_CXX_COMPILER ${PLATFORM_TOOLCHAIN_PATH}/${ESP32_TOOLCHAIN_PREFIX}g++ CACHE PATH "" FORCE)
4141
#set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
4242
# There is probably a cleaner way to do this....
43-
# /home/fx/Arduino/hardware/espressif/esp32/tools/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc -nostdlib -L/home/fx/Arduino/hardware/espressif/esp32/tools/sdk/lib -L/home/fx/Arduino/hardware/espressif/esp32/tools/sdk/ld -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception -Wl,--start-group /tmp/arduino_build_362873/sketch/GetChipID.ino.cpp.o /tmp/arduino_cache_671610/core/core_fa51f82175cf2dd1c3422f76e57c15bd.a -lgcc -lesp32 -lphy -lesp_http_client -lmbedtls -lrtc -lesp_http_server -lbtdm_app -lspiffs -lbootloader_support -lmdns -lnvs_flash -lfatfs -lpp -lnet80211 -ljsmn -lface_detection -llibsodium -lvfs -ldl_lib -llog -lfreertos -lcxx -lsmartconfig_ack -lxtensa-debug-module -lheap -ltcpip_adapter -lmqtt -lulp -lfd -lfb_gfx -lnghttp -lprotocomm -lsmartconfig -lm -lethernet -limage_util -lc_nano -lsoc -ltcp_transport -lc -lmicro-ecc -lface_recognition -ljson -lwpa_supplicant -lmesh -lesp_https_ota -lwpa2 -lexpat -llwip -lwear_levelling -lapp_update -ldriver -lbt -lespnow -lcoap -lasio -lnewlib -lconsole -lapp_trace -lesp32-camera -lhal -lprotobuf-c -lsdmmc -lcore -lpthread -lcoexist -lfreemodbus -lspi_flash -lesp-tls -lwpa -lwifi_provisioning -lwps -lesp_adc_cal -lesp_event -lopenssl -lesp_ringbuf -lfr -lstdc++ -Wl,--end-group -Wl,-EL -o /tmp/arduino_build_362873/GetChipID.ino.elf
44-
45-
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -lgcc -mthumb -Wl,--start-group <OBJECTS> <LINK_LIBRARIES> -Wl,--end-group -o <TARGET> ")
43+
# -L/home/fx/Arduino/hardware/espressif/esp32/tools/sdk/lib
44+
SET(ESP32_LIBS "-lgcc -lesp32 -lphy -lesp_http_client -lmbedtls -lrtc -lesp_http_server -lbtdm_app -lspiffs -lbootloader_support -lmdns -lnvs_flash -lfatfs -lpp -lnet80211 -ljsmn -lface_detection -llibsodium -lvfs -ldl_lib -llog -lfreertos -lcxx -lsmartconfig_ack -lxtensa-debug-module -lheap -ltcpip_adapter -lmqtt -lulp -lfd -lfb_gfx -lnghttp -lprotocomm -lsmartconfig -lm -lethernet -limage_util -lc_nano -lsoc -ltcp_transport -lc -lmicro-ecc -lface_recognition -ljson -lwpa_supplicant -lmesh -lesp_https_ota -lwpa2 -lexpat -llwip -lwear_levelling -lapp_update -ldriver -lbt -lespnow -lcoap -lasio -lnewlib -lconsole -lapp_trace -lesp32-camera -lhal -lprotobuf-c -lsdmmc -lcore -lpthread -lcoexist -lfreemodbus -lspi_flash -lesp-tls -lwpa -lwifi_provisioning -lwps -lesp_adc_cal -lesp_event -lopenssl -lesp_ringbuf -lfr -lstdc++ ")
45+
SET(ESP32_OPTS " -Wl,-EL -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception ")
46+
SET(ESP32_LD "-T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld ")
47+
#
48+
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_CXX_LINK_FLAGS> -nostdlib -L${PLATFORM_PATH}/esp32/tools/sdk/ld/ -L${PLATFORM_PATH}/esp32/tools/sdk/lib <LINK_FLAGS> ${ESP32_LD} ${ESP32_OPTS}-Wl,--start-group <OBJECTS> <LINK_LIBRARIES> ${ESP32_LIBS} -Wl,--end-group -Wl,-EL -o <TARGET> ")
4649
#set(CMAKE_EXE_LINKER_FLAGS "" CACHE INTERNAL "")
4750
#set(CMAKE_CXX_LINK_FLAGS "" CACHE INTERNAL "")
4851
#set(CMAKE_C_LINK_FLAGS "" CACHE INTERNAL "")

Platform/Core/Targets/ArduinoFirmwareTargetCreatorEsp32.cmake

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ function(create_arduino_firmware_target TARGET_NAME BOARD_ID ALL_SRCS ALL_LIBS
4848
SET(MAP_OPT "-Wl,-Map,${TARGET_NAME}.map")
4949

5050
#
51-
set_board_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS ${BOARD_ID} ${MANUAL})
5251
ENDIF(FALSE)
52+
set_board_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS ${BOARD_ID} ${MANUAL})
5353
# Add ld script
5454
MESSAGE(STATUS "ARDUINO_LINK_FLAGS ${ARDUINO_LINK_FLAGS}, LINK_FLAGS: ${LINK_FLAGS}")
5555
set_target_properties(${TARGET_NAME} PROPERTIES
@@ -66,17 +66,15 @@ function(create_arduino_firmware_target TARGET_NAME BOARD_ID ALL_SRCS ALL_LIBS
6666
if (NOT EXECUTABLE_OUTPUT_PATH)
6767
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
6868
endif ()
69-
70-
69+
70+
dump_all()
71+
7172
# Display target size
72-
#add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
73-
#COMMAND ${CMAKE_COMMAND}
74-
#ARGS -DFIRMWARE_IMAGE=${TARGET_NAME}.elf
75-
#-DMCU=atmega1280
76-
##-DEEPROM_IMAGE=${TARGET_PATH}.eep
77-
#-P ${ARDUINO_SIZE_SCRIPT}
73+
# add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
74+
#COMMAND ${PLATFORM_TOOLCHAIN_PATH}/${ESP32_TOOLCHAIN_PREFIX}size
75+
#ARGS -A=${TARGET_NAME}.elf
7876
#COMMENT "Calculating image size"
7977
#VERBATIM)
8078

81-
79+
8280
endfunction()

0 commit comments

Comments
 (0)