diff --git a/firmware/config/boards/hellen/hellen-gm-e67/board.mk b/firmware/config/boards/hellen/hellen-gm-e67/board.mk index aacdf52e9e..09029d83a3 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/board.mk +++ b/firmware/config/boards/hellen/hellen-gm-e67/board.mk @@ -11,9 +11,6 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE DDEFS += -DFIRMWARE_ID=\"hellenE67\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE -# No hardware serial TS -DDEFS += -DTS_NO_PRIMARY=1 - include $(BOARDS_DIR)/hellen/hellen-common144.mk diff --git a/firmware/config/boards/hellen/hellen-honda-k/board.mk b/firmware/config/boards/hellen/hellen-honda-k/board.mk index 2cb48d5d2c..a2426ad993 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/board.mk +++ b/firmware/config/boards/hellen/hellen-honda-k/board.mk @@ -11,9 +11,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen121nissan/board.mk b/firmware/config/boards/hellen/hellen121nissan/board.mk index 1b34f2d910..dbb16389b8 100644 --- a/firmware/config/boards/hellen/hellen121nissan/board.mk +++ b/firmware/config/boards/hellen/hellen121nissan/board.mk @@ -11,9 +11,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen121nissan\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index d69b63bf09..17dbfa9df5 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -11,9 +11,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen128/board.mk b/firmware/config/boards/hellen/hellen128/board.mk index b2e8d1bbab..744ba99807 100644 --- a/firmware/config/boards/hellen/hellen128/board.mk +++ b/firmware/config/boards/hellen/hellen128/board.mk @@ -13,9 +13,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen128\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen154hyundai/board.mk b/firmware/config/boards/hellen/hellen154hyundai/board.mk index 4a44dfa34e..2f3665226c 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/board.mk +++ b/firmware/config/boards/hellen/hellen154hyundai/board.mk @@ -11,8 +11,8 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 + + # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen154hyundai\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk index d857966333..d0f8812836 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/board.mk @@ -11,9 +11,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellenNA6\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen72/board.mk b/firmware/config/boards/hellen/hellen72/board.mk index 858588eb5a..83e98277e1 100644 --- a/firmware/config/boards/hellen/hellen72/board.mk +++ b/firmware/config/boards/hellen/hellen72/board.mk @@ -13,9 +13,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen72\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen81/board.mk b/firmware/config/boards/hellen/hellen81/board.mk index 1489e39b8e..0d0522f757 100644 --- a/firmware/config/boards/hellen/hellen81/board.mk +++ b/firmware/config/boards/hellen/hellen81/board.mk @@ -6,9 +6,6 @@ BOARDINC = $(BOARDS_DIR)/hellen/hellen81 DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen81\" #DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE diff --git a/firmware/config/boards/hellen/hellen88bmw/board.mk b/firmware/config/boards/hellen/hellen88bmw/board.mk index 01856e1e06..5e4c1705e1 100644 --- a/firmware/config/boards/hellen/hellen88bmw/board.mk +++ b/firmware/config/boards/hellen/hellen88bmw/board.mk @@ -12,9 +12,6 @@ endif DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE -# Disable serial ports on this board as UART3 causes a DMA conflict with the SD card -DDEFS += -DTS_NO_PRIMARY=1 - # Add them all together DDEFS += -DFIRMWARE_ID=\"hellen88bmw\" $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index e863485a1f..ed75288898 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -24,7 +24,7 @@ DDEFS += -DEFI_CONSOLE_TX_BRAIN_PIN=Gpio::B10 -DEFI_CONSOLE_RX_BRAIN_PIN=Gpio::B # on MRE 0.6.0 we have SD card on SPI2 which shared channel 3 with USART3 # todo: enable serial which would not DMA thus not conflict? DDEFS += -DSTM32_UART_USE_USART3=FALSE -DHAL_USE_UART=FALSE -DDEFS += -DEFI_USE_UART_DMA=FALSE -DTS_NO_PRIMARY=TRUE +DDEFS += -DEFI_USE_UART_DMA=FALSE # maybe a way to disable SPI2 privately #DDEFS += -DSTM32_SPI_USE_SPI2=FALSE diff --git a/firmware/config/boards/tdg-pdm8/board.mk b/firmware/config/boards/tdg-pdm8/board.mk index 8cc52d65f3..4b5d8019be 100644 --- a/firmware/config/boards/tdg-pdm8/board.mk +++ b/firmware/config/boards/tdg-pdm8/board.mk @@ -5,9 +5,6 @@ PROJECT_CPU = ARCH_STM32F4 DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::C11 -# No serial ports for now -DDEFS += -DTS_NO_PRIMARY=TRUE - # No USB DDEFS += -DEFI_USB_SERIAL=FALSE diff --git a/firmware/config/stm32f7ems/efifeatures.h b/firmware/config/stm32f7ems/efifeatures.h index 87983aa206..bfc867f563 100644 --- a/firmware/config/stm32f7ems/efifeatures.h +++ b/firmware/config/stm32f7ems/efifeatures.h @@ -43,9 +43,6 @@ #define EFI_USE_UART_DMA FALSE // UART driver not implemented on F7 -#ifndef TS_NO_PRIMARY -#define TS_NO_PRIMARY 1 -#endif #define AUX_SERIAL_DEVICE (&SD6)