Merge branch 'master' into looking_at_i2c

This commit is contained in:
Ben V. Brown
2020-09-06 10:40:29 +10:00
committed by GitHub

View File

@@ -10,7 +10,6 @@ endif
# Discover the source files to build
SOURCE := $(shell find . -type f -name '*.c')
SOURCE_CPP := $(shell find . -type f -name '*.cpp')
SOURCES := $(shell find . -type f -name '*.c*')
S_SRCS := $(shell find . -type f -name '*.s')
APP_INC_DIR = ./Core/Inc
@@ -47,7 +46,7 @@ HEXFILE_DIR=Hexfile
OUTPUT_DIR=Objects
# code optimisation ------------------------------------------------------------
OPTIM=-Os -flto -ffat-lto-objects -finline-small-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections
OPTIM=-Os -flto -finline-small-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections
flash_size=64k
bootldr_size=0x4000
@@ -64,7 +63,7 @@ DEBUG=-g3
# Without debug code
#DEBUG=
# libs -------------------------------------------------------------------------
LIBS=
@@ -95,7 +94,9 @@ LINKER_FLAGS=-Wl,--gc-sections \
-Wl,--wrap=free \
-o$(OUT_HEXFILE).elf \
-Wl,-Map=$(OUT_HEXFILE).map \
-lm -Wl,--undefined=vTaskSwitchContext \
-lm \
-Wl,--undefined=vTaskSwitchContext \
-Wl,--undefined=pxCurrentTCB \
-Wl,--defsym=__FLASH_SIZE__=$(flash_size) \
-Wl,--defsym=__BOOTLDR_SIZE__=$(bootldr_size) \
--specs=nano.specs