diff --git a/tools/test/makefiles/BLACK_F407VE b/tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod similarity index 55% rename from tools/test/makefiles/BLACK_F407VE rename to tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod index ddfb4ea..005a963 100644 --- a/tools/test/makefiles/BLACK_F407VE +++ b/tools/test/makefiles/BLACK_F407XX_BLACK_F407VE_STLinkMethod @@ -1,16 +1,23 @@ -name=BLACK F407VE (upload: STLink) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=1048576 -upload.maximum_data_size=196608 -build.mcu=cortex-m4 +name=BLACK F407VE/ZE/ZG boards +upload.maximum_size=524288 +upload.maximum_data_size=131072 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard build.core=arduino -build.variant=BLACK_F407VE -build.board=BLACK_F407VE +build.board=BLACK_F407XX build.series=STM32F4 -build.extra_flags=-DSTM32F407VE -DHSE_VALUE=8000000 -DSERIAL_USB +build.f_cpu=168000000L upload.tool=stlink_upload upload.protocol=STLink +menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.Automatic=Automatically selected based on upload method +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +menu.serial.SerialUART1=SerialUART1 +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +build.variant=BLACK_F407VE +build.extra_flags=-DSTM32F407VE -DHSE_VALUE=8000000 build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -24,7 +31,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" compiler.warning_flags=-w @@ -33,17 +40,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=196608 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -51,6 +58,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -60,11 +71,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407VE -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407VE -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407VE -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=196608 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407VE.bin @@ -72,6 +83,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -89,7 +102,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -98,7 +111,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -108,4 +121,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod new file mode 100644 index 0000000..d808142 --- /dev/null +++ b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZE_STLinkMethod @@ -0,0 +1,124 @@ +name=BLACK F407VE/ZE/ZG boards +upload.maximum_size=1232896 +upload.maximum_data_size=131072 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard +build.core=arduino +build.board=BLACK_F407XX +build.series=STM32F4 +build.f_cpu=168000000L +upload.tool=stlink_upload +upload.protocol=STLink +menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.Automatic=Automatically selected based on upload method +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +menu.serial.SerialUART1=SerialUART1 +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +build.variant=BLACK_F407ZE +build.extra_flags=-DSTM32F407ZE -DHSE_VALUE=8000000 +build.project_name=$(VARIANT)/$(PROJECT)/out +object_file=$@ +source_file=$< +includes=$(INCLUDES) +object_files=$(OBJECTS) +runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER) +runtime.ide.version=10802 +build.path=build +build.arch=STM32GENERIC +runtime.hardware.path=../../STM32 +build.system.path=../../STM32/system +build.core.path=../../STM32/cores/arduino +build.variant.path=$(PATH_VARIANT) +name=STM32GENERIC for STM32 boards +version=1.0.0 +compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra +compiler.path=$(PATH_COMPILER)/bin/ +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.ar.flags=rcs +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 +compiler.elf2hex.flags=-O binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.size.cmd=arm-none-eabi-size +compiler.define=-DARDUINO= +build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= +build.ldscript=ldscript.ld +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.cpp.extra_flags= +compiler.S.extra_flags= +compiler.ar.extra_flags= +compiler.elf2hex.extra_flags= +build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' +build.usb_manufacturer="Unknown" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZE -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" +recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin +recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407ZE.bin +recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf" +recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* +recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown +tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher +tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher +tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher +tools.nucleoFlasher.cmd.linux=nucleoFlasher +tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat +tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX +tools.nucleoFlasher.upload.params.verbose= +tools.nucleoFlasher.upload.params.quiet= +tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}" +tools.stlink_upload.cmd=stlink_upload +tools.stlink_upload.cmd.windows=stlink_upload.bat +tools.stlink_upload.path.windows=../../STM32/tools/win +tools.stlink_upload.path.macosx=../../STM32/tools/macosx +tools.stlink_upload.path.linux=../../STM32/tools/linux +tools.stlink_upload.path.linux64=../../STM32/tools/linux64 +tools.stlink_upload.upload.params.verbose=-d +tools.stlink_upload.upload.params.quiet= +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.cmd=maple_upload +tools.maple_upload.cmd.windows=maple_upload.bat +tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.maple_upload.upload.params.verbose=-d +tools.maple_upload.upload.params.quiet= +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.cmd=serial_upload +tools.serial_upload.cmd.windows=serial_upload.bat +tools.serial_upload.cmd.macosx=serial_upload +tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.serial_upload.upload.params.verbose=-d +tools.serial_upload.upload.params.quiet=n +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod new file mode 100644 index 0000000..6ab2dc6 --- /dev/null +++ b/tools/test/makefiles/BLACK_F407XX_BLACK_F407ZG_STLinkMethod @@ -0,0 +1,124 @@ +name=BLACK F407VE/ZE/ZG boards +upload.maximum_size=1232896 +upload.maximum_data_size=131072 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard +build.core=arduino +build.board=BLACK_F407XX +build.series=STM32F4 +build.f_cpu=168000000L +upload.tool=stlink_upload +upload.protocol=STLink +menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.Automatic=Automatically selected based on upload method +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +menu.serial.SerialUART1=SerialUART1 +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +build.variant=BLACK_F407ZG +build.extra_flags=-DSTM32F407ZG -DHSE_VALUE=8000000 +build.project_name=$(VARIANT)/$(PROJECT)/out +object_file=$@ +source_file=$< +includes=$(INCLUDES) +object_files=$(OBJECTS) +runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER) +runtime.ide.version=10802 +build.path=build +build.arch=STM32GENERIC +runtime.hardware.path=../../STM32 +build.system.path=../../STM32/system +build.core.path=../../STM32/cores/arduino +build.variant.path=$(PATH_VARIANT) +name=STM32GENERIC for STM32 boards +version=1.0.0 +compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra +compiler.path=$(PATH_COMPILER)/bin/ +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.ar.flags=rcs +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 +compiler.elf2hex.flags=-O binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.size.cmd=arm-none-eabi-size +compiler.define=-DARDUINO= +build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= +build.ldscript=ldscript.ld +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.cpp.extra_flags= +compiler.S.extra_flags= +compiler.ar.extra_flags= +compiler.elf2hex.extra_flags= +build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' +build.usb_manufacturer="Unknown" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_BLACK_F407XX -DARDUINO_ARCH_STM32GENERIC -DSTM32F407ZG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" +recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin +recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLACK_F407ZG.bin +recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf" +recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* +recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown +tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher +tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher +tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher +tools.nucleoFlasher.cmd.linux=nucleoFlasher +tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat +tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX +tools.nucleoFlasher.upload.params.verbose= +tools.nucleoFlasher.upload.params.quiet= +tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}" +tools.stlink_upload.cmd=stlink_upload +tools.stlink_upload.cmd.windows=stlink_upload.bat +tools.stlink_upload.path.windows=../../STM32/tools/win +tools.stlink_upload.path.macosx=../../STM32/tools/macosx +tools.stlink_upload.path.linux=../../STM32/tools/linux +tools.stlink_upload.path.linux64=../../STM32/tools/linux64 +tools.stlink_upload.upload.params.verbose=-d +tools.stlink_upload.upload.params.quiet= +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.cmd=maple_upload +tools.maple_upload.cmd.windows=maple_upload.bat +tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.maple_upload.upload.params.verbose=-d +tools.maple_upload.upload.params.quiet= +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.cmd=serial_upload +tools.serial_upload.cmd.windows=serial_upload.bat +tools.serial_upload.cmd.macosx=serial_upload +tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.serial_upload.upload.params.verbose=-d +tools.serial_upload.upload.params.quiet=n +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BluePill_BMPMethod b/tools/test/makefiles/BluePill_BMPMethod index 0fcc797..ead6db8 100644 --- a/tools/test/makefiles/BluePill_BMPMethod +++ b/tools/test/makefiles/BluePill_BMPMethod @@ -1,6 +1,4 @@ name=BluePill F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=gdb_bmp upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,8 +8,8 @@ build.core=arduino build.variant=BLUEPILL build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=bmp_upload -build.upload_flags= build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -25,7 +23,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +32,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +50,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +63,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin @@ -73,6 +75,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +94,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +103,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +113,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BluePill_DFUUploadMethod b/tools/test/makefiles/BluePill_DFUUploadMethod index d549c20..31f5a12 100644 --- a/tools/test/makefiles/BluePill_DFUUploadMethod +++ b/tools/test/makefiles/BluePill_DFUUploadMethod @@ -1,6 +1,4 @@ name=BluePill F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=maple_dfu upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -9,7 +7,8 @@ build.board=BLUEPILL build.core=arduino build.variant=BLUEPILL build.series=STM32F1 -build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DSERIAL_USB +build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 +build.f_cpu=72000000L upload.tool=maple_upload build.ldscript=ldscript_bootloader_2000.ld upload.usbID=1EAF:0003 @@ -17,6 +16,7 @@ upload.altID=2 flash.maximum_size=122880 maximum_data_size=122880 ram.maximum_size=20480 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -30,7 +30,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -39,17 +39,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -57,6 +57,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUSB build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -66,11 +70,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x2000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin @@ -78,6 +82,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -95,7 +101,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 2 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -104,7 +110,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 2 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -114,4 +120,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 2 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BluePill_STLinkMethod b/tools/test/makefiles/BluePill_STLinkMethod index 4b075b6..aba90ef 100644 --- a/tools/test/makefiles/BluePill_STLinkMethod +++ b/tools/test/makefiles/BluePill_STLinkMethod @@ -1,6 +1,4 @@ name=BluePill F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=STLink upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,8 +8,9 @@ build.core=arduino build.variant=BLUEPILL build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=stlink_upload -build.upload_flags=-DSERIAL_USB -DUSB_DISC_PIN=PB9 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -25,7 +24,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +33,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +51,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUSB build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +64,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin @@ -73,6 +76,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +95,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +104,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +114,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/BluePill_serialMethod b/tools/test/makefiles/BluePill_serialMethod index 88f4de7..38bcfcb 100644 --- a/tools/test/makefiles/BluePill_serialMethod +++ b/tools/test/makefiles/BluePill_serialMethod @@ -1,6 +1,4 @@ name=BluePill F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=maple_serial upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,7 +8,9 @@ build.core=arduino build.variant=BLUEPILL build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=serial_upload +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART1 build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -24,7 +24,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -33,17 +33,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -51,6 +51,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART1 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -60,11 +64,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_BLUEPILL -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.BLUEPILL.bin @@ -72,6 +76,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -89,7 +95,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -98,7 +104,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -108,4 +114,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/DISCOVERY_F407VG b/tools/test/makefiles/DISCOVERY_F407VG new file mode 100644 index 0000000..b939964 --- /dev/null +++ b/tools/test/makefiles/DISCOVERY_F407VG @@ -0,0 +1,123 @@ +name=Discovery F407VG +upload.maximum_size=1048576 +upload.maximum_data_size=131072 +build.core=arduino +build.board=DISCOVERY_F407VG +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard +build.series=STM32F4 +build.variant=DISCOVERY_F407VG +build.extra_flags=-DSTM32F407VG -DHSE_VALUE=8000000 +build.f_cpu=168000000L +upload.protocol=STLink +upload.tool=stlink_upload +menu.usb.SerialUSB=Serial [Virtual COM port] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +menu.serial.SerialUART2=SerialUART2 [PA2/PA3] +menu.serial.SerialUART2.build.extra_flags_serial=-DMENU_SERIAL=SerialUART2 +build.project_name=$(VARIANT)/$(PROJECT)/out +object_file=$@ +source_file=$< +includes=$(INCLUDES) +object_files=$(OBJECTS) +runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER) +runtime.ide.version=10802 +build.path=build +build.arch=STM32GENERIC +runtime.hardware.path=../../STM32 +build.system.path=../../STM32/system +build.core.path=../../STM32/cores/arduino +build.variant.path=$(PATH_VARIANT) +name=STM32GENERIC for STM32 boards +version=1.0.0 +compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra +compiler.path=$(PATH_COMPILER)/bin/ +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.ar.flags=rcs +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 +compiler.elf2hex.flags=-O binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.size.cmd=arm-none-eabi-size +compiler.define=-DARDUINO= +build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= +build.ldscript=ldscript.ld +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.cpp.extra_flags= +compiler.S.extra_flags= +compiler.ar.extra_flags= +compiler.elf2hex.extra_flags= +build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' +build.usb_manufacturer="Unknown" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=168000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F407VG -DARDUINO_ARCH_STM32GENERIC -DSTM32F407VG -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" +recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin +recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F407VG.bin +recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf" +recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* +recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown +tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher +tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher +tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher +tools.nucleoFlasher.cmd.linux=nucleoFlasher +tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat +tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX +tools.nucleoFlasher.upload.params.verbose= +tools.nucleoFlasher.upload.params.quiet= +tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}" +tools.stlink_upload.cmd=stlink_upload +tools.stlink_upload.cmd.windows=stlink_upload.bat +tools.stlink_upload.path.windows=../../STM32/tools/win +tools.stlink_upload.path.macosx=../../STM32/tools/macosx +tools.stlink_upload.path.linux=../../STM32/tools/linux +tools.stlink_upload.path.linux64=../../STM32/tools/linux64 +tools.stlink_upload.upload.params.verbose=-d +tools.stlink_upload.upload.params.quiet= +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.cmd=maple_upload +tools.maple_upload.cmd.windows=maple_upload.bat +tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.maple_upload.upload.params.verbose=-d +tools.maple_upload.upload.params.quiet= +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.cmd=serial_upload +tools.serial_upload.cmd.windows=serial_upload.bat +tools.serial_upload.cmd.macosx=serial_upload +tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.serial_upload.upload.params.verbose=-d +tools.serial_upload.upload.params.quiet=n +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/DISCOVERY_F429ZI b/tools/test/makefiles/DISCOVERY_F429ZI new file mode 100644 index 0000000..3227217 --- /dev/null +++ b/tools/test/makefiles/DISCOVERY_F429ZI @@ -0,0 +1,122 @@ +name=Discovery F429ZI +upload.maximum_size=1048576 +upload.maximum_data_size=131072 +build.core=arduino +build.board=DISCOVERY_F429ZI +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard +build.series=STM32F4 +build.variant=DISCOVERY_F429ZI +build.extra_flags=-DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 +upload.protocol=STLink +upload.tool=stlink_upload +menu.usb.SerialUSB=Serial [Virtual COM port] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +menu.serial.SerialUART1=SerialUART1 [PA9/PA10] +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +build.project_name=$(VARIANT)/$(PROJECT)/out +object_file=$@ +source_file=$< +includes=$(INCLUDES) +object_files=$(OBJECTS) +runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER) +runtime.ide.version=10802 +build.path=build +build.arch=STM32GENERIC +runtime.hardware.path=../../STM32 +build.system.path=../../STM32/system +build.core.path=../../STM32/cores/arduino +build.variant.path=$(PATH_VARIANT) +name=STM32GENERIC for STM32 boards +version=1.0.0 +compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra +compiler.path=$(PATH_COMPILER)/bin/ +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.ar.flags=rcs +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 +compiler.elf2hex.flags=-O binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.size.cmd=arm-none-eabi-size +compiler.define=-DARDUINO= +build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= +build.ldscript=ldscript.ld +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.cpp.extra_flags= +compiler.S.extra_flags= +compiler.ar.extra_flags= +compiler.elf2hex.extra_flags= +build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' +build.usb_manufacturer="Unknown" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU={build.f_cpu} -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_DISCOVERY_F429ZI -DARDUINO_ARCH_STM32GENERIC -DSTM32F429ZI -DSTM32F429xx -DHSE_VALUE=8000000 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" +recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin +recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F429ZI.bin +recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf" +recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* +recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown +tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher +tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher +tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher +tools.nucleoFlasher.cmd.linux=nucleoFlasher +tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat +tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX +tools.nucleoFlasher.upload.params.verbose= +tools.nucleoFlasher.upload.params.quiet= +tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}" +tools.stlink_upload.cmd=stlink_upload +tools.stlink_upload.cmd.windows=stlink_upload.bat +tools.stlink_upload.path.windows=../../STM32/tools/win +tools.stlink_upload.path.macosx=../../STM32/tools/macosx +tools.stlink_upload.path.linux=../../STM32/tools/linux +tools.stlink_upload.path.linux64=../../STM32/tools/linux64 +tools.stlink_upload.upload.params.verbose=-d +tools.stlink_upload.upload.params.quiet= +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.cmd=maple_upload +tools.maple_upload.cmd.windows=maple_upload.bat +tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.maple_upload.upload.params.verbose=-d +tools.maple_upload.upload.params.quiet= +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.cmd=serial_upload +tools.serial_upload.cmd.windows=serial_upload.bat +tools.serial_upload.cmd.macosx=serial_upload +tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.serial_upload.upload.params.verbose=-d +tools.serial_upload.upload.params.quiet=n +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/DISCOVERY_F746NG b/tools/test/makefiles/DISCOVERY_F746NG new file mode 100644 index 0000000..35e257b --- /dev/null +++ b/tools/test/makefiles/DISCOVERY_F746NG @@ -0,0 +1,123 @@ +name=Discovery F746NG +upload.maximum_size=1048576 +upload.maximum_data_size=327680 +build.core=arduino +build.board=DISCOVERY_F746NG +build.mcu=cortex-m7 +build.series=STM32F7 +build.variant=DISCOVERY_F746NG +build.extra_flags=-DSTM32F746NG +build.f_cpu=218000000L +upload.protocol=STLink +upload.tool=stlink_upload +menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.SerialUART1=SerialUART1 [Through ST-Link Virtual COM port] [PB7/PA9] +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +menu.serial.SerialUSB=SerialUSB +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB +build.project_name=$(VARIANT)/$(PROJECT)/out +object_file=$@ +source_file=$< +includes=$(INCLUDES) +object_files=$(OBJECTS) +runtime.tools.arm-none-eabi-gcc.path=$(PATH_COMPILER) +runtime.ide.version=10802 +build.path=build +build.arch=STM32GENERIC +runtime.hardware.path=../../STM32 +build.system.path=../../STM32/system +build.core.path=../../STM32/cores/arduino +build.variant.path=$(PATH_VARIANT) +name=STM32GENERIC for STM32 boards +version=1.0.0 +compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src" "-I../../STM32/system/STM32F7/stm32_chip" +compiler.warning_flags=-w +compiler.warning_flags.none=-w +compiler.warning_flags.default= +compiler.warning_flags.more=-Wall +compiler.warning_flags.all=-Wall -Wextra +compiler.path=$(PATH_COMPILER)/bin/ +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.ar.flags=rcs +compiler.c.elf.flags=-mcpu=cortex-m7 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 +compiler.elf2hex.flags=-O binary +compiler.elf2hex.cmd=arm-none-eabi-objcopy +compiler.ldflags= +compiler.size.cmd=arm-none-eabi-size +compiler.define=-DARDUINO= +build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= +build.ldscript=ldscript.ld +compiler.c.extra_flags= +compiler.c.elf.extra_flags= +compiler.cpp.extra_flags= +compiler.S.extra_flags= +compiler.ar.extra_flags= +compiler.elf2hex.extra_flags= +build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' +build.usb_manufacturer="Unknown" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC -DSTM32F746NG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src" "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC -DSTM32F746NG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src" "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -DF_CPU=218000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F7 -DARDUINO=10802 -DARDUINO_DISCOVERY_F746NG -DARDUINO_ARCH_STM32GENERIC -DSTM32F746NG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F7/CMSIS_Inc" "-I../../STM32/system/STM32F7/CMSIS_Src" "-I../../STM32/system/STM32F7/HAL_Inc" "-I../../STM32/system/STM32F7/HAL_Src" "-I../../STM32/system/STM32F7/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m7 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" +recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin +recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_F746NG.bin +recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIANT)/$(PROJECT)/out.elf" +recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* +recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* +recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown +tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher +tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher +tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher +tools.nucleoFlasher.cmd.linux=nucleoFlasher +tools.nucleoFlasher.cmd.windows=nucleoFlasher.bat +tools.nucleoFlasher.cmd.macosx=nucleoFlasherMacOsX +tools.nucleoFlasher.upload.params.verbose= +tools.nucleoFlasher.upload.params.quiet= +tools.nucleoFlasher.upload.pattern="{path}/{cmd}" {upload.verbose} -I "build/$(VARIANT)/$(PROJECT)/out.bin" -O "{massstorage_drive}" +tools.stlink_upload.cmd=stlink_upload +tools.stlink_upload.cmd.windows=stlink_upload.bat +tools.stlink_upload.path.windows=../../STM32/tools/win +tools.stlink_upload.path.macosx=../../STM32/tools/macosx +tools.stlink_upload.path.linux=../../STM32/tools/linux +tools.stlink_upload.path.linux64=../../STM32/tools/linux64 +tools.stlink_upload.upload.params.verbose=-d +tools.stlink_upload.upload.params.quiet= +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.cmd=maple_upload +tools.maple_upload.cmd.windows=maple_upload.bat +tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.maple_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.maple_upload.upload.params.verbose=-d +tools.maple_upload.upload.params.quiet= +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.cmd=serial_upload +tools.serial_upload.cmd.windows=serial_upload.bat +tools.serial_upload.cmd.macosx=serial_upload +tools.serial_upload.path={runtime.tools.STM32Tools.path}/tools/win +tools.serial_upload.path.macosx={runtime.tools.STM32Tools.path}/tools/macosx +tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux +tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 +tools.serial_upload.upload.params.verbose=-d +tools.serial_upload.upload.params.quiet=n +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/DISCOVERY_L053C8 b/tools/test/makefiles/DISCOVERY_L053C8 index 80a106d..c55548a 100644 --- a/tools/test/makefiles/DISCOVERY_L053C8 +++ b/tools/test/makefiles/DISCOVERY_L053C8 @@ -1,16 +1,22 @@ -name=Discovery L053C8 (upload: STLink) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Discovery L053C8 +upload.maximum_size=65536 +upload.maximum_data_size=8192 build.core=arduino build.board=DISCOVERY_L053C8 build.mcu=cortex-m0 build.series=STM32L0 build.variant=DISCOVERY_L053C8 -build.extra_flags=-DSTM32L053C8 -DSERIAL_USB +build.extra_flags=-DSTM32L053C8 +build.f_cpu=32000000L upload.protocol=STLink upload.tool=stlink_upload +menu.usb.SerialUSB=Serial [Virtual COM port, PA11/PA12 pins] +menu.usb.SerialUSB.build.extra_flags_usb=-DMENU_USB_SERIAL +menu.usb.Disabled=Disabled, no USB +menu.serial.SerialUART1=SerialUART1 [Through ST-Link Virtual COM port] [PA9/PA10] +menu.serial.SerialUART1.build.extra_flags_serial=-DMENU_SERIAL=SerialUART1 +menu.serial.SerialUSB=SerialUSB (USB connector) +menu.serial.SerialUSB.build.extra_flags_serial=-DMENU_SERIAL=SerialUSB build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -24,7 +30,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" compiler.warning_flags=-w @@ -33,17 +39,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -51,6 +57,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -60,11 +70,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 -DSERIAL_USB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_DISCOVERY_L053C8 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053C8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.DISCOVERY_L053C8.bin @@ -72,6 +82,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -89,7 +101,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -98,7 +110,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -108,4 +120,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/MapleMini_F103CB_BMPMethod b/tools/test/makefiles/MapleMini_F103CB_BMPMethod index 098d479..9c27217 100644 --- a/tools/test/makefiles/MapleMini_F103CB_BMPMethod +++ b/tools/test/makefiles/MapleMini_F103CB_BMPMethod @@ -1,6 +1,4 @@ name=MapleMini F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=gdb_bmp upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,8 +8,8 @@ build.core=arduino build.variant=MAPLE_MINI build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=bmp_upload -build.upload_flags= build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -25,7 +23,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +32,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +50,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +63,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin @@ -73,6 +75,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +94,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +103,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +113,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1 b/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1 index 618c9f7..acc1cbf 100644 --- a/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1 +++ b/tools/test/makefiles/MapleMini_F103CB_DFUUploadMethod1 @@ -1,6 +1,4 @@ name=MapleMini F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=maple_dfu upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -9,7 +7,8 @@ build.board=MAPLE_MINI build.core=arduino build.variant=MAPLE_MINI build.series=STM32F1 -build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DSERIAL_USB -DUSB_DISC_PIN=PB9 +build.extra_flags=-DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 +build.f_cpu=72000000L upload.tool=maple_upload build.ldscript=ldscript_bootloader_5000.ld upload.usbID=1EAF:0003 @@ -17,6 +16,7 @@ upload.altID=1 flash.maximum_size=110592 maximum_data_size=110592 ram.maximum_size=17408 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUSB build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -30,7 +30,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -39,17 +39,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -57,6 +57,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUSB build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -66,11 +70,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DSERIAL_USB -DUSB_DISC_PIN=PB9 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DSERIAL_USB -DUSB_DISC_PIN=PB9 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DSERIAL_USB -DUSB_DISC_PIN=PB9 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 -DMENU_SERIAL_AUTO=SerialUSB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DVECT_TAB_OFFSET=0x5000 -DUSB_DISC_PIN=PB9 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin @@ -78,6 +82,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -95,7 +101,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 1 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -104,7 +110,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 1 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -114,4 +120,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} 1 1EAF:0003 "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/MapleMini_F103CB_STLinkMethod b/tools/test/makefiles/MapleMini_F103CB_STLinkMethod index b7744cd..e6eccc6 100644 --- a/tools/test/makefiles/MapleMini_F103CB_STLinkMethod +++ b/tools/test/makefiles/MapleMini_F103CB_STLinkMethod @@ -1,6 +1,4 @@ name=MapleMini F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=STLink upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,8 +8,9 @@ build.core=arduino build.variant=MAPLE_MINI build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=stlink_upload -build.upload_flags=-DSERIAL_USB -DUSB_DISC_PIN=PB9 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART1 build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ source_file=$< @@ -25,7 +24,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +33,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +51,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART1 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +64,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB -DMENU_SERIAL_AUTO=SerialUART1 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin @@ -73,6 +76,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +95,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +104,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +114,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/MapleMini_F103CB_serialMethod b/tools/test/makefiles/MapleMini_F103CB_serialMethod index 6ed3034..f9cf369 100644 --- a/tools/test/makefiles/MapleMini_F103CB_serialMethod +++ b/tools/test/makefiles/MapleMini_F103CB_serialMethod @@ -1,6 +1,4 @@ name=MapleMini F103CB -vid.0=0x0483 -pid.0=0x5740 upload.protocol=maple_serial upload.maximum_size=131072 upload.maximum_data_size=20480 @@ -10,6 +8,7 @@ build.core=arduino build.variant=MAPLE_MINI build.series=STM32F1 build.extra_flags=-DSTM32F103CB +build.f_cpu=72000000L upload.tool=serial_upload build.project_name=$(VARIANT)/$(PROJECT)/out object_file=$@ @@ -24,7 +23,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -33,17 +32,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -51,6 +50,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -60,11 +63,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_MAPLE_MINI -DARDUINO_ARCH_STM32GENERIC -DSTM32F103CB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=20480 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.MAPLE_MINI.bin @@ -72,6 +75,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -89,7 +94,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -98,7 +103,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -108,4 +113,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod index 8814393..bb59448 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_F030R8_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=65536 +upload.maximum_data_size=8192 build.mcu=cortex-m0 build.series=STM32F0 build.variant=NUCLEO_F030R8 build.extra_flags=-DSTM32F030R8 massstorage_drive=NODE_F030R8 +build.f_cpu=48000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=48000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F030R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F0/CMSIS_Inc" "-I../../STM32/system/STM32F0/CMSIS_Src" "-I../../STM32/system/STM32F0/HAL_Inc" "-I../../STM32/system/STM32F0/HAL_Src" "-I../../STM32/system/STM32F0/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F030R8.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod index 3d89620..dc3decd 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_F103RB_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=131072 +upload.maximum_data_size=20480 build.mcu=cortex-m3 build.series=STM32F1 build.variant=NUCLEO_F103RB build.extra_flags=-DSTM32F103RB massstorage_drive=NODE_F103RB +build.f_cpu=64000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=64000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F103RB "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F1/CMSIS_Inc" "-I../../STM32/system/STM32F1/CMSIS_Src" "-I../../STM32/system/STM32F1/HAL_Inc" "-I../../STM32/system/STM32F1/HAL_Src" "-I../../STM32/system/STM32F1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F103RB.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod index 8a1e7dd..91492e3 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_F303RE_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 -build.mcu=cortex-m4 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=524288 +upload.maximum_data_size=81920 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard build.series=STM32F3 build.variant=NUCLEO_F303RE build.extra_flags=-DSTM32F303RE massstorage_drive=NODE_F303RE +build.f_cpu=72000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=72000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F3 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F303RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F3/CMSIS_Inc" "-I../../STM32/system/STM32F3/CMSIS_Src" "-I../../STM32/system/STM32F3/HAL_Inc" "-I../../STM32/system/STM32F3/HAL_Src" "-I../../STM32/system/STM32F3/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F303RE.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod index 16385a1..8764125 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_F411RE_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 -build.mcu=cortex-m4 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=524288 +upload.maximum_data_size=131072 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard build.series=STM32F4 build.variant=NUCLEO_F411RE build.extra_flags=-DSTM32F411RE massstorage_drive=NODE_F411RE +build.f_cpu=100000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=100000000L -mthumb -c -g -x assembler-with-cpp -DSTM32F4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32F411RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32F4/CMSIS_Inc" "-I../../STM32/system/STM32F4/CMSIS_Src" "-I../../STM32/system/STM32F4/HAL_Inc" "-I../../STM32/system/STM32F4/HAL_Src" "-I../../STM32/system/STM32F4/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_F411RE.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod index 41b1a81..0496c63 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_L053R8_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=65536 +upload.maximum_data_size=8192 build.mcu=cortex-m0 build.series=STM32L0 build.variant=NUCLEO_L053R8 build.extra_flags=-DSTM32L053R8 massstorage_drive=NODE_L053R8 +build.f_cpu=32000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -c -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L0 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L053R8 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L0/CMSIS_Inc" "-I../../STM32/system/STM32L0/CMSIS_Src" "-I../../STM32/system/STM32L0/HAL_Inc" "-I../../STM32/system/STM32L0/HAL_Src" "-I../../STM32/system/STM32L0/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m0 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L053R8.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod index e5ad6a9..15ac78e 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_L152RE_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=524288 +upload.maximum_data_size=81920 build.mcu=cortex-m3 build.series=STM32L1 build.variant=NUCLEO_L152RE build.extra_flags=-DSTM32L152RE massstorage_drive=NODE_L152RE +build.f_cpu=32000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -c -x assembler-with-cpp -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -DF_CPU=32000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L1 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L152RE "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L1/CMSIS_Inc" "-I../../STM32/system/STM32L1/CMSIS_Src" "-I../../STM32/system/STM32L1/HAL_Inc" "-I../../STM32/system/STM32L1/HAL_Src" "-I../../STM32/system/STM32L1/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m3 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L152RE.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod b/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod index 9374516..848cc39 100644 --- a/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod +++ b/tools/test/makefiles/NUCLEO_64_Nucleo_L476RG_STLinkMethod @@ -1,15 +1,15 @@ -name=Nucleo-64 (Select board from submenu) -vid.0=0x0483 -pid.0=0x5711 -upload.maximum_size=524288 -upload.maximum_data_size=131072 +name=Nucleo-64 boards build.core=arduino build.board=NUCLEO_64 -build.mcu=cortex-m4 +build.extra_flags_serial_auto=-DMENU_SERIAL_AUTO=SerialUART2 +upload.maximum_size=1024 +upload.maximum_data_size=131072 +build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard build.series=STM32L4 build.variant=NUCLEO_L476RG build.extra_flags=-DSTM32L476RG massstorage_drive=NODE_L476RG +build.f_cpu=80000000L upload.protocol=STLink upload.tool=stlink_upload build.project_name=$(VARIANT)/$(PROJECT)/out @@ -25,7 +25,7 @@ runtime.hardware.path=../../STM32 build.system.path=../../STM32/system build.core.path=../../STM32/cores/arduino build.variant.path=$(PATH_VARIANT) -name=STM32 boards by danieleff +name=STM32GENERIC for STM32 boards version=1.0.0 compiler.extra_includes="-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" compiler.warning_flags=-w @@ -34,17 +34,17 @@ compiler.warning_flags.default= compiler.warning_flags.more=-Wall compiler.warning_flags.all=-Wall -Wextra compiler.path=$(PATH_COMPILER)/bin/ -compiler.S.cmd = arm-none-eabi-gcc -compiler.c.cmd = arm-none-eabi-gcc -compiler.cpp.cmd = arm-none-eabi-g++ -compiler.ar.cmd = arm-none-eabi-ar -compiler.c.elf.cmd = arm-none-eabi-gcc -compiler.objcopy.cmd = arm-none-eabi-objcopy -compiler.S.flags=-mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -compiler.c.flags=-mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -compiler.cpp.flags=-mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD +compiler.S.cmd=arm-none-eabi-gcc +compiler.c.cmd=arm-none-eabi-gcc +compiler.cpp.cmd=arm-none-eabi-g++ +compiler.ar.cmd=arm-none-eabi-ar +compiler.c.elf.cmd=arm-none-eabi-gcc +compiler.objcopy.cmd=arm-none-eabi-objcopy +compiler.S.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -x assembler-with-cpp +compiler.c.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD +compiler.cpp.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD compiler.ar.flags=rcs -compiler.c.elf.flags=-DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align +compiler.c.elf.flags=-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0 compiler.elf2hex.flags=-O binary compiler.elf2hex.cmd=arm-none-eabi-objcopy @@ -52,6 +52,10 @@ compiler.ldflags= compiler.size.cmd=arm-none-eabi-size compiler.define=-DARDUINO= build.extra_flags= +build.extra_flags_usb= +build.extra_flags_serial= +build.extra_flags_serial_auto= +build.extra_flags_menu= -DMENU_SERIAL_AUTO=SerialUART2 build.ldscript=ldscript.ld compiler.c.extra_flags= compiler.c.elf.extra_flags= @@ -61,11 +65,11 @@ compiler.ar.extra_flags= compiler.elf2hex.extra_flags= build.usb_flags=-DUSBD_VID={build.vid} -DUSBD_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' build.usb_manufacturer="Unknown" -recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mthumb -c -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" -recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mthumb -c -x assembler-with-cpp -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.c.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -MMD -Os -w -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.cpp.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-g++" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -Os -w -std=gnu++11 -ffunction-sections -fdata-sections -nostdlib -fno-threadsafe-statics --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -Dprintf=iprintf -MMD -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG -DMENU_SERIAL_AUTO=SerialUART2 "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" +recipe.S.o.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -DF_CPU=80000000L -mthumb -c -g -x assembler-with-cpp -DSTM32L4 -DARDUINO=10802 -DARDUINO_NUCLEO_64 -DARDUINO_ARCH_STM32GENERIC -DSTM32L476RG "-I../../STM32/cores/arduino/stm32" "-I../../STM32/cores/arduino/usb" "-I../../STM32/system/CMSIS" "-I../../STM32/system/STM32L4/CMSIS_Inc" "-I../../STM32/system/STM32L4/CMSIS_Src" "-I../../STM32/system/STM32L4/HAL_Inc" "-I../../STM32/system/STM32L4/HAL_Src" "-I../../STM32/system/STM32L4/stm32_chip" $(INCLUDES) "$<" -o "$@" recipe.ar.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-ar" rcs "{archive_file_path}" "$@" -recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -DFLASH_SIZE=512K -DRAM_SIZE=131072 -mcpu=cortex-m4 -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -Wl,--end-group -lm -lgcc --specs=nano.specs +recipe.c.combine.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-gcc" -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Os -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align "-T$(PATH_VARIANT)/ldscript.ld" "-Wl,-Map,build/$(VARIANT)/$(PROJECT)/out.map" -o "build/$(VARIANT)/$(PROJECT)/out.elf" "-Lbuild" -Wl,--start-group $(OBJECTS) -lc -Wl,--end-group -lm -lgcc --specs=nano.specs recipe.objcopy.bin.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-objcopy" -O binary "build/$(VARIANT)/$(PROJECT)/out.elf" "build/$(VARIANT)/$(PROJECT)/out.bin" recipe.output.tmp_file=$(VARIANT)/$(PROJECT)/out.bin recipe.output.save_file=$(VARIANT)/$(PROJECT)/out.NUCLEO_L476RG.bin @@ -73,6 +77,8 @@ recipe.size.pattern="$(PATH_COMPILER)/bin/arm-none-eabi-size" -A "build/$(VARIAN recipe.size.regex=^(?:\.text|\.data|\.rodata)\s+([0-9]+).* recipe.size.regex.data=^(?:\.data|\.bss|\._user_heap_stack)\s+([0-9]+).* recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).* +upload.altID=unknown +upload.usbID=unknown tools.nucleoFlasher.path=../../STM32/tools/win/nucleoFlasher tools.nucleoFlasher.path.macosx=../../STM32/tools/macosx/nucleoFlasher tools.nucleoFlasher.path.linux=../../STM32/tools/linux/nucleoFlasher @@ -90,7 +96,7 @@ tools.stlink_upload.path.linux=../../STM32/tools/linux tools.stlink_upload.path.linux64=../../STM32/tools/linux64 tools.stlink_upload.upload.params.verbose=-d tools.stlink_upload.upload.params.quiet= -tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.maple_upload.cmd=maple_upload tools.maple_upload.cmd.windows=maple_upload.bat tools.maple_upload.path={runtime.tools.STM32Tools.path}/tools/win @@ -99,7 +105,7 @@ tools.maple_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.maple_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.maple_upload.upload.params.verbose=-d tools.maple_upload.upload.params.quiet= -tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.maple_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" tools.serial_upload.cmd=serial_upload tools.serial_upload.cmd.windows=serial_upload.bat tools.serial_upload.cmd.macosx=serial_upload @@ -109,4 +115,4 @@ tools.serial_upload.path.linux={runtime.tools.STM32Tools.path}/tools/linux tools.serial_upload.path.linux64={runtime.tools.STM32Tools.path}/tools/linux64 tools.serial_upload.upload.params.verbose=-d tools.serial_upload.upload.params.quiet=n -tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "build/$(VARIANT)/$(PROJECT)/out.bin" +tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} unknown unknown "build/$(VARIANT)/$(PROJECT)/out.bin" diff --git a/tools/test/platform_to_makefile.py b/tools/test/platform_to_makefile.py index 54865bb..4c6cd3e 100644 --- a/tools/test/platform_to_makefile.py +++ b/tools/test/platform_to_makefile.py @@ -25,8 +25,8 @@ for line in boards: key = key.strip() value = value.strip() - if key.startswith('menu.nucleo_board.'): - key = key.replace('menu.nucleo_board.', '') + if key.startswith('menu.subboard.'): + key = key.replace('menu.subboard.', '') if '.' not in key: continue @@ -46,7 +46,9 @@ for line in boards: variant_uploads.setdefault(board + '_' + upload, variants[board].copy())[k] = value else: variants.setdefault(board, OrderedDict())[key] = value - + +del variant_uploads['BLACK_F407XX_serialMethod'] +del variant_uploads['BLACK_F407XX_STLinkMethod'] for variant in variants.keys(): upload_exists = False