diff options
| author | Ben V. Brown <[email protected]> | 2022-10-20 18:06:05 +1100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-20 18:06:05 +1100 |
| commit | 1a3d6ba219232c8d66f0dca37d12e64ae56fa7dd (patch) | |
| tree | f6b323e490273fd8e4f199fc39bde0247ade51d0 /source/Makefile | |
| parent | 82f49b5f50dd27009f5a769d3c00fe4e00db3b41 (diff) | |
| download | IronOS-1a3d6ba219232c8d66f0dca37d12e64ae56fa7dd.tar.gz IronOS-1a3d6ba219232c8d66f0dca37d12e64ae56fa7dd.zip | |
Fixing up TS80P Build (#1429)
* Silence wchart warning + go back to simple size limiter
Going from smart linker file to basic #defines to make things just easier to debug
* 2 deg c increments for NTC table
* Update cmsis_gcc.h
* Drop special linker
* Update portmacro.h
* Update Makefile
Diffstat (limited to 'source/Makefile')
| -rw-r--r-- | source/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/Makefile b/source/Makefile index 8aec2e7d..3f0064e7 100644 --- a/source/Makefile +++ b/source/Makefile @@ -152,15 +152,15 @@ S_SRCS := $(shell find $(MINIWARE_STARTUP_DIR) -type f -name '*.S') LDSCRIPT=$(MINIWARE_LD_FILE)
DEV_GLOBAL_DEFS= -D STM32F103T8Ux -D STM32F1 -D STM32 -D USE_HAL_DRIVER -D STM32F103xB -D USE_RTOS_SYSTICK -D GCC_ARMCM3 \
-D ARM_MATH_CM3 \
- -D STM32F10X_MD
-DEV_LDFLAGS=
+ -D STM32F10X_MD
+DEV_LDFLAGS= -Wl,--wrap=printf -Wl,--no-wchar-size-warning
DEV_AFLAGS=
DEV_CFLAGS= -D VECT_TAB_OFFSET=$(bootldr_size)U
DEV_CXXFLAGS=
CPUFLAGS= -mcpu=cortex-m3 \
-mthumb \
-mfloat-abi=soft
-flash_size=64k
+flash_size=62k
bootldr_size=0x4000
DEVICE_DFU_ADDRESS=0x08004000
DEVICE_DFU_VID_PID=0x1209:0xDB42
@@ -186,7 +186,7 @@ DEV_CXXFLAGS= CPUFLAGS= -mcpu=cortex-m3 \
-mthumb \
-mfloat-abi=soft
-flash_size=128k
+flash_size=126k
bootldr_size=32k
DEVICE_DFU_ADDRESS=0x08008000
DEVICE_DFU_VID_PID=0x1209:0xDB42
@@ -313,7 +313,7 @@ $(shell find $(DEVICE_BSP_DIR) -type d \( $(EXCLUDED_DIRS) \) -prune -false -o $(shell find $(SOURCE_MIDDLEWARES_DIR) -type f -name '*.cpp')
# code optimisation ------------------------------------------------------------
-OPTIM=-Os -flto -finline-small-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections -fshort-enums -fsingle-precision-constant -fno-common
+OPTIM=-Os -fshort-wchar -flto -finline-small-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections -fshort-enums -fsingle-precision-constant -fno-common
# global defines ---------------------------------------------------------------
GLOBAL_DEFINES += $(DEV_GLOBAL_DEFS) -D USE_RTOS_SYSTICK -D MODEL_$(model) -D VECT_TAB_OFFSET=$(bootldr_size)U -fshort-wchar
@@ -343,6 +343,7 @@ endif CC=$(COMPILER_PREFIX)-gcc
CPP=$(COMPILER_PREFIX)-g++
OBJCOPY=$(COMPILER_PREFIX)-objcopy
+SIZE=$(COMPILER_PREFIX)-size
OBJDUMP=$(COMPILER_PREFIX)-objdump
# use gcc in assembler mode so we can use defines etc in assembly
AS=$(COMPILER_PREFIX)-gcc -x assembler-with-cpp
@@ -405,7 +406,7 @@ CXXFLAGS=$(DEV_CXXFLAGS) \ -D${COMPILER} \
-MMD \
$(CHECKOPTIONS) \
- -std=c++14 \
+ -std=c++17 \
$(OPTIM) \
-fno-rtti \
-fno-exceptions \
@@ -469,6 +470,7 @@ firmware-%: $(HEXFILE_DIR)/$(model)_%.hex $(HEXFILE_DIR)/$(model)_%.bin $(HEXFIL %.bin : %.elf Makefile
$(OBJCOPY) $< -O binary $@
+ $(SIZE) $<
%.dfu : %.bin Makefile
python3 dfuse-pack.py -b $(DEVICE_DFU_ADDRESS)@0:$< -D $(DEVICE_DFU_VID_PID) $@
|