[esp32] fix arduino path

Author: mean

ArduinoToolchainEsp32.cmake

@@ -45,7 +45,7 @@ SET(ESP32_LIBS  "-lgcc -lesp32 -lphy -lesp_http_client -lmbedtls -lrtc -lesp_htt
 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  ")
 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 ")
 #
- 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> ")
+ set(CMAKE_CXX_LINK_EXECUTABLE    "<CMAKE_C_COMPILER>   <CMAKE_CXX_LINK_FLAGS>  -nostdlib -L${PLATFORM_PATH}/tools/sdk/ld/ -L${PLATFORM_PATH}/tools/sdk/lib <LINK_FLAGS>   ${ESP32_LD}  ${ESP32_OPTS}-Wl,--start-group  <OBJECTS> <LINK_LIBRARIES>  ${ESP32_LIBS} -Wl,--end-group -Wl,-EL  -o <TARGET> ")
 #set(CMAKE_EXE_LINKER_FLAGS "" CACHE INTERNAL "")
 #set(CMAKE_CXX_LINK_FLAGS   "" CACHE INTERNAL "")
 #set(CMAKE_C_LINK_FLAGS     "" CACHE INTERNAL "")

Platform/Core/Targets/ArduinoFirmwareTargetCreatorEsp32.cmake

@@ -23,32 +23,12 @@ ENDMACRO(DBG)
 function(create_arduino_firmware_target TARGET_NAME BOARD_ID ALL_SRCS ALL_LIBS
         COMPILE_FLAGS LINK_FLAGS MANUAL)
 
-
-#/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
-
-
     string(STRIP "${ALL_SRCS}" ALL_SRCS)
     set(VARIANT_FOLDER ${${BOARD_ID}.build.variant})
     set(RUNTIME_FILES_PATH ${${VARIANT_FOLDER}.path})
     add_executable(${TARGET_NAME}  ${ALL_SRCS})
     set_target_properties(${TARGET_NAME} PROPERTIES SUFFIX ".elf")
 
-
-    IF(FALSE)
-    # depending on the upload method we use different ld script
-    # let's hardcode to bootloader for now 
-    if( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
-        SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript} ") # Hack
-    else( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
-        SET(BOOTLOADER_LINK_OPT  "-T${RUNTIME_FILES_PATH}/${${BOARD_ID}.menu.cpu.bootloader20.build.ldscript} ") # Hack
-    endif( DEFINED ${BOARD_ID}.menu.cpu.DFUUploadMethod.build.ldscript  )
-
-    SET(BOOTLOADER_LINK_OPT  "${BOOTLOADER_LINK_OPT} -L${RUNTIME_FILES_PATH}/ld") # Hack
-    MESSAGE(STATUS "Bootloader : <${BOOTLOADER_LINK_OPT}>")
-    SET(MAP_OPT  "-Wl,-Map,${TARGET_NAME}.map")
-
-    #
-    ENDIF(FALSE)
     set_board_flags(ARDUINO_COMPILE_FLAGS ARDUINO_LINK_FLAGS ${BOARD_ID} ${MANUAL})
     # Add ld script
     MESSAGE(STATUS "ARDUINO_LINK_FLAGS ${ARDUINO_LINK_FLAGS},  LINK_FLAGS: ${LINK_FLAGS}")

Platform/Initialization/DefaultCFlagsEsp32.cmake

@@ -8,7 +8,7 @@ ENDIF(NOT DEFINED ARDUINO_UPLOAD_METHOD)
 IF(NOT DEFINED ARDUINO_CFLAGS_SET)
     SET(DEFINED ARDUINO_CFLAGS_SET 1)
     SET(COMMON_FLAGS "-fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wpointer-arith  -Wno-maybe-uninitialized -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-parameter -Wno-sign-compare ") 
-    SET(COMMON_FLAGS " ${COMMON_FLAGS}  -DF_CPU=240000000L -DARDUINO=10810 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD='ESP32_DEV' -DARDUINO_VARIANT='esp32' -DESP32 -DCORE_DEBUG_LEVEL=0 ")
+    SET(COMMON_FLAGS " ${COMMON_FLAGS}  -DF_CPU=240000000L  -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 -DARDUINO_BOARD='ESP32_DEV' -DARDUINO_VARIANT='esp32' -DESP32 -DCORE_DEBUG_LEVEL=0 ")
 
     SET(ARDUINO_DEFAULT_CFLAGS " -std=gnu99 -Os -g3  -Wno-old-style-declaration ${COMMON_FLAGS}")
     SET(ARDUINO_DEFAULT_CXXFLAGS "-std=gnu++11 -Os -g3  -fexceptions  -fno-rtti  ${COMMON_FLAGS}")

Platform/Initialization/RegisterSpecificHardwarePlatform.cmake

@@ -4,26 +4,29 @@
 IF(PLATFORM_PATH)
     SET(ORIGINAL_PLATFORM_PATH ${PLATFORM_PATH} CACHE INTERNAL "")
 ENDIF(PLATFORM_PATH)
-set(PLATFORM_PATH "${BASE_PATH}/${VENDOR_ID}/${PLATFORM_ARCHITECTURE}")
+set(PLATFORM_PATH "${BASE_PATH}/${VENDOR_ID}")
 set(PLATFORM "${VENDOR_ID}")
 set(ARCHITECTURE_ID ${PLATFORM_ARCHITECTURE})
 
 # Avoid defining a platform multiple times if it has already been defined before
 string(TOUPPER ${PLATFORM} PLATFORM)
 list(FIND ARDUINO_PLATFORMS ${PLATFORM} PLATFORM_EXISTS)
+#MESSAGE( STATUS "BASE = ${BASE_PATH} PLATFORM_PATH =${PLATFORM_PATH} VENDOR=${VENDOR_ID} PLATFORM_ArCHITECTURE=${PLATFORM_ARCHITECTURE}")
+#MESSAGE( STATUS "PLATFORM = ${PLATFORM}")
+
 
 if (PLATFORM_EXISTS GREATER -1)
     return()
 endif ()
 
+SET(PLATFORM ARDUINO)
 set(${PLATFORM}_PLATFORM_PATH ${PLATFORM_PATH} CACHE INTERNAL "The path to ${PLATFORM}")
 set(ARDUINO_PLATFORMS ${ARDUINO_PLATFORMS} ${PLATFORM} CACHE INTERNAL "A list of registered platforms")
 
 find_file(${PLATFORM}_CORES_PATH
         NAMES cores
         PATHS ${PLATFORM_PATH}
         DOC "Path to directory containing the Arduino core sources.")
-
 find_file(${PLATFORM}_VARIANTS_PATH
         NAMES variants
         PATHS ${PLATFORM_PATH}