Skip to content

Commit 8ad3521

Browse files
committed
Merge commit 'ca3db7cc0814e77584b0d4697f31f731e8a7a93e' into spi-fix
2 parents 91014b4 + ca3db7c commit 8ad3521

6 files changed

Lines changed: 3 additions & 9 deletions

File tree

GD32F1/platform.rewrite.keys.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

GD32F1/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ compiler.warning_flags.all=-Wall -Wextra -DDEBUG_LEVEL=DEBUG_ALL
1414

1515
# compiler variables
1616
# ----------------------
17-
compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/
17+
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
1818
compiler.c.cmd=arm-none-eabi-gcc
1919
compiler.c.flags=-c -g -Os {compiler.warning_flags} -MMD -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -DBOARD_{build.variant} -D{build.vect} -DERROR_LED_PORT={build.error_led_port} -DERROR_LED_PIN={build.error_led_pin}
2020
compiler.c.elf.cmd=arm-none-eabi-g++

STM32F3/platform.rewrite.keys.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

STM32F3/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version=0.1.0
1010
# ----------------------
1111
#build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
1212

13-
compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/
13+
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
1414
compiler.c.cmd=arm-none-eabi-gcc
1515
compiler.c.flags=-c -g -Os -w -MMD -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -DBOARD_{build.variant} -D{build.vect} -DERROR_LED_PORT={build.error_led_port} -DERROR_LED_PIN={build.error_led_pin}
1616
compiler.c.elf.cmd=arm-none-eabi-g++

STM32F4/platform.rewrite.keys.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

STM32F4/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version=0.1.0
1010
# ----------------------
1111
#build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
1212

13-
compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/
13+
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
1414
compiler.c.cmd=arm-none-eabi-gcc
1515
compiler.c.flags=-c -g -Os -w -MMD -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -DBOARD_{build.variant} -D{build.vect} -DERROR_LED_PORT={build.error_led_port} -DERROR_LED_PIN={build.error_led_pin}
1616
compiler.c.elf.cmd=arm-none-eabi-g++

0 commit comments

Comments
 (0)