Merge branch 'master' of https://github.com/mean00/arduino-cmake-stm32

Author: mean

FindPatch.cmake

@@ -0,0 +1,39 @@
+if (NOT PATCH_EXECUTABLE)
+	message(STATUS "Checking for patch")
+	message(STATUS "******************")
+
+	find_program(PATCH_EXECUTABLE patch)
+	set(PATCH_EXECUTABLE ${PATCH_EXECUTABLE} CACHE STRING "")
+
+	if (PATCH_EXECUTABLE)
+		message(STATUS "Found patch")
+		
+		if (VERBOSE)
+			message(STATUS "Path: ${PATCH_EXECUTABLE}")
+		endif (VERBOSE)
+	else (PATCH_EXECUTABLE)
+		message(FATAL_ERROR "patch not found")
+	endif (PATCH_EXECUTABLE)
+
+	message("")
+endif (NOT PATCH_EXECUTABLE)
+
+macro(patch_file baseDir patchFile)
+	execute_process(COMMAND ${PATCH_EXECUTABLE} -p0 -i "${patchFile}"
+					WORKING_DIRECTORY "${baseDir}"
+                                        RESULT_VARIABLE   res
+        )
+        if(res)
+                MESSAGE(FATAL_ERROR "Patch failed")
+        endif(res)
+endmacro(patch_file)
+
+macro(patch_file_p p baseDir patchFile)
+	execute_process(COMMAND ${PATCH_EXECUTABLE} -p ${p}  -i "${patchFile}"
+					WORKING_DIRECTORY "${baseDir}"
+                                        RESULT_VARIABLE   res
+				)
+        if(res)
+                MESSAGE(FATAL_ERROR "Patch failed")
+        endif(res)
+endmacro(patch_file_p)

cmake_tools.cmake

@@ -0,0 +1,54 @@
+
+MACRO(Log)
+   MESSAGE(STATUS "Log: ${ARGN}")
+ENDMACRO(Log)
+#
+#
+#
+FUNCTION(EXPORT_LIBRARY lib)    
+    Log(${ARGN})
+    cmake_parse_arguments(PARSE_ARGV 
+                            1
+                            "${lib}"
+                            "" 
+                            "NAME"
+                            "FLAGS;INCLUDE_PATHS" 
+                             )
+    SET_PROPERTY(GLOBAL PROPERTY CMAKE_STM32_${lib}_FLAGS           ${${lib}_FLAGS}   )
+    SET_PROPERTY(GLOBAL PROPERTY CMAKE_STM32_${lib}_INCLUDE_PATHS   ${${lib}_INCLUDE_PATHS}   )
+    SET_PROPERTY(GLOBAL PROPERTY CMAKE_STM32_${lib}_NAME            ${${lib}_NAME}   )
+    Log("SET Include for ${lib}: <${CMAKE_STM32_${lib}_INCLUDE_PATHS}> : < ${${lib}_INCLUDE_PATHS}>")
+    Log("SET NAME for ${lib}: >${CMAKE_STM33_${lib}_NAME}> :  <${${lib}_NAME}>")
+    set(unused "${${lib}_UNPARSED_ARGUMENTS}")
+    IF("${unused}" STREQUAL "")
+    ELSE("${unused}" STREQUAL "")
+        MESSAGE(STATUS "Unparsed Arg ${${lib}_UNPARSED_ARGUMENTS}")
+    ENDIF("${unused}" STREQUAL "")
+ENDFUNCTION(EXPORT_LIBRARY lib)
+
+#
+#
+#
+MACRO(IMPORT_LIBRARY lib )
+    GET_PROPERTY( ${lib}_FLAGS          GLOBAL PROPERTY      CMAKE_STM32_${lib}_FLAGS  )
+    GET_PROPERTY( ${lib}_INCLUDE_PATHS  GLOBAL PROPERTY      CMAKE_STM32_${lib}_INCLUDE_PATHS )
+   
+    FOREACH(I ${${lib}_INCLUDE_PATHS} )
+        Log("Get Include for ${lib} : <${I}>")
+        include_directories( ${I} )
+    ENDFOREACH(I ${${lib}_INCLUDE_PATHS} )
+    add_definitions( ${${lib}_FLAGS}   )
+    Log("Get FLAGS for ${lib} : <${${lib}_FLAGS}>")
+ENDMACRO(IMPORT_LIBRARY lib)
+
+#
+#
+#
+FUNCTION(LINK_TO_LIBRARIES target )
+    Log("Link to lib ${ARGN}")
+    FOREACH(l ${ARGN})
+             GET_PROPERTY( ${l}_NAME           GLOBAL PROPERTY      CMAKE_STM32_${l}_NAME  )
+             TARGET_LINK_LIBRARIES(${target}  ${${l}_NAME})
+             Log("Linking to ${${l}_NAME}")
+    ENDFOREACH(l ${ARGN})
+ENDFUNCTION(LINK_TO_LIBRARIES )

select_mcu_stm32.cmake

@@ -0,0 +1,28 @@
+OPTION(USE_GD32F103   "Use GD32F103 MCU" FALSE) 
+OPTION(USE_GD32F303   "Use GD32F303 MCU" FALSE) 
+# Select platform and installation for extra arduino files AND toolchain (compiler...)
+SET(PLATFORM_ARCHITECTURE "STM32F1")
+IF(USE_GD32F103 OR USE_GD32F303)
+    SET(MCU_SPEED             96000000)                 # Max speed, above 96M USB will not work (?)
+ENDIF(USE_GD32F103 OR USE_GD32F303)
+
+# Board setup
+IF(USE_GD32F103)
+    SET(EXTENSION             "GD32F103")
+    set(X_ARDUINO_DEFAULT_BOARD genericGD32F103C)        # Default Board ID, when not specified
+    set(X_ARDUINO_CPU           GD32F103C8)
+    ADD_DEFINITIONS("-DHIGH_SPEED_ADC")
+    SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+ELSEIF(USE_GD32F303)
+    SET(EXTENSION             "GD32F303")
+    set(X_ARDUINO_DEFAULT_BOARD genericGD32F303C)        # Default Board ID, when not specified
+    set(X_ARDUINO_CPU           GD32F303C8)
+    ADD_DEFINITIONS("-DHIGH_SPEED_ADC")
+    SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+ELSE()
+    SET(EXTENSION             "STM32F103")
+    set(X_ARDUINO_LD_FILE      jtag)      # Use that instead of default jtag-c8 to get the full 128 kB
+    set(X_ARDUINO_DEFAULT_BOARD genericSTM32F103C)        # Default Board ID, when not specified
+    set(X_ARDUINO_CPU           STM32F103C8)
+    SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
+ENDIF(USE_GD32F103)

utils/unpatch.bash

@@ -0,0 +1,5 @@
+rm -Rf STM32F1/patched STM32F1/variants/generic_gd32f103c2/ STM32F1/variants/generic_gd32f303c/
+rm -Rf STM32F1/patched*
+git checkout STM32F1/boards.txt STM32F1/system/libmaple/stm32f1/include/series/stm32.h
+git checkout STM32F1/variants/generic_stm32f103c/board.cpp
+git checkout STM32F1/cores/maple/main.cpp