From edd9e5ca835b19aaec0e620b4fe307227b75b099 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 7 Jun 2024 02:19:54 -0400 Subject: [PATCH] STM32F7.ld has 768 hard-coded --- firmware/config/boards/hellen/alphax-4chan/board.mk | 3 --- firmware/config/boards/hellen/alphax-8chan-revA/board.mk | 1 - firmware/config/boards/hellen/alphax-8chan/board.mk | 2 -- firmware/config/boards/hellen/hellen154hyundai_f7/board.mk | 2 +- .../hellen154hyundai_f7/meta-info-hellen154hyundai_f7.env | 2 +- firmware/config/boards/microrusefi/board.mk | 1 - .../boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env | 2 +- firmware/config/boards/proteus/meta-info-proteus_f7_debug.env | 2 +- 8 files changed, 4 insertions(+), 11 deletions(-) diff --git a/firmware/config/boards/hellen/alphax-4chan/board.mk b/firmware/config/boards/hellen/alphax-4chan/board.mk index 4a58c7fb4e..8709915a60 100644 --- a/firmware/config/boards/hellen/alphax-4chan/board.mk +++ b/firmware/config/boards/hellen/alphax-4chan/board.mk @@ -30,9 +30,6 @@ DDEFS += -DTRIGGER_SCOPE ifeq ($(PROJECT_CPU),ARCH_STM32F7) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7 - # TODO: why do I struggle to fit into flash? compare with Proteus - #Linker options, flash size - USE_OPT += -Wl,--defsym=FLASH_SIZE=768k # TODO do we only support serial on F7 but not UART? DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::D6 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::D5 DDEFS += -DTS_PRIMARY_UxART_PORT=SD2 -DEFI_TS_PRIMARY_IS_SERIAL=TRUE -DSTM32_SERIAL_USE_USART2=TRUE -DSTM32_UART_USE_USART2=FALSE diff --git a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk index f80de25c4d..e4e83dfa6d 100644 --- a/firmware/config/boards/hellen/alphax-8chan-revA/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan-revA/board.mk @@ -12,7 +12,6 @@ DDEFS += -DADC_MUX_PIN=Gpio::B3 include $(BOARDS_DIR)/hellen/hellen-common144.mk ifeq ($(PROJECT_CPU),ARCH_STM32F7) - # TODO: why do I struggle to fit into flash? compare with Proteus DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE DDEFS += -DENABLE_PERF_TRACE=FALSE else ifeq ($(PROJECT_CPU),ARCH_STM32F4) diff --git a/firmware/config/boards/hellen/alphax-8chan/board.mk b/firmware/config/boards/hellen/alphax-8chan/board.mk index fa1b4f7412..3c968c4e79 100644 --- a/firmware/config/boards/hellen/alphax-8chan/board.mk +++ b/firmware/config/boards/hellen/alphax-8chan/board.mk @@ -14,10 +14,8 @@ LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=H176_MCU_MEGA_LED1 include $(BOARDS_DIR)/hellen/hellen-common176.mk ifeq ($(PROJECT_CPU),ARCH_STM32F7) - # TODO: why do I struggle to fit into flash? compare with Proteus DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE DDEFS += -DENABLE_PERF_TRACE=FALSE - USE_OPT += -Wl,--defsym=FLASH_SIZE=768k else ifeq ($(PROJECT_CPU),ARCH_STM32F4) # This board has trigger scope hardware! DDEFS += -DTRIGGER_SCOPE diff --git a/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk b/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk index 770f3c8133..af5c9b67ae 100644 --- a/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai_f7/board.mk @@ -15,7 +15,7 @@ DDEFS += -DBOARD_MC33810_COUNT=1 DDEFS += -DCH_DBG_ENABLE_ASSERTS=FALSE DDEFS += -DENABLE_PERF_TRACE=FALSE - USE_OPT += -Wl,--defsym=FLASH_SIZE=768k + # Add them all together diff --git a/firmware/config/boards/hellen/hellen154hyundai_f7/meta-info-hellen154hyundai_f7.env b/firmware/config/boards/hellen/hellen154hyundai_f7/meta-info-hellen154hyundai_f7.env index 217e09b0d7..216dd6e502 100644 --- a/firmware/config/boards/hellen/hellen154hyundai_f7/meta-info-hellen154hyundai_f7.env +++ b/firmware/config/boards/hellen/hellen154hyundai_f7/meta-info-hellen154hyundai_f7.env @@ -2,5 +2,5 @@ SHORT_BOARD_NAME=hellen154hyundai_f7 PROJECT_CPU=ARCH_STM32F7 _USE_OPENBLT=yes EXTRA_PARAMS=-DEFI_LUA=FALSE -DEFI_LUA_LOOKUP=FALSE -_DEBUG_LEVEL_OPT=-O0 -ggdb -g -Wl,--defsym=FLASH_SIZE=768k +_DEBUG_LEVEL_OPT=-O0 -ggdb -g _INCLUDE_ELF=yes diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index 37b4a493fb..1b1679918c 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -49,7 +49,6 @@ DDEFS += -DSTM32_SERIAL_USE_USART3=TRUE DDEFS += -DHW_MICRO_RUSEFI=1 ifeq ($(PROJECT_CPU),ARCH_STM32F7) - USE_OPT += -Wl,--defsym=FLASH_SIZE=768k DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7 else ifeq ($(PROJECT_CPU),ARCH_STM32F4) DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4 diff --git a/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env index 84232e1a37..61d0579dd1 100644 --- a/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env +++ b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env @@ -3,6 +3,6 @@ PROJECT_CPU=ARCH_STM32F7 USE_FATFS=no __OOOPS_NO_MULTI_LINE_SYNTAX_HERE?! EXTRA_PARAMS=-DSTM32F767xx -DEFI_INJECTOR_PIN3=Gpio::Unassigned -DSTM32_HSE_BYPASS=TRUE -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE -DEFI_LUA=FALSE -DEFI_HPFP=FALSE -DEFI_ALTERNATOR_CONTROL=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEBUG_LEVEL_OPT=-O0 -ggdb -g -Wl,--defsym=FLASH_SIZE=768k +DEBUG_LEVEL_OPT=-O0 -ggdb -g INCLUDE_ELF=yes SKIP_RATE=50 diff --git a/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env b/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env index 12a33ca7c7..a3145824b2 100644 --- a/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env +++ b/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env @@ -1,6 +1,6 @@ SHORT_BOARD_NAME=proteus_f7 PROJECT_CPU=ARCH_STM32F7 EXTRA_PARAMS=-DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE -DEFI_LUA=FALSE -DEFI_HPFP=FALSE -DEFI_ALTERNATOR_CONTROL=FALSE -DEFI_LOGIC_ANALYZER=FALSE -DEFI_TOOTH_LOGGER=FALSE -DRAMDISK_INVALID -DEBUG_LEVEL_OPT=-O0 -ggdb -g -Wl,--defsym=FLASH_SIZE=768k +DEBUG_LEVEL_OPT=-O0 -ggdb -g INCLUDE_ELF=yes SKIP_RATE=0