diff --git a/firmware/config/boards/48way/board.h b/firmware/config/boards/48way/board.h index 588a55bdcb..2e6d31f3aa 100755 --- a/firmware/config/boards/48way/board.h +++ b/firmware/config/boards/48way/board.h @@ -39,9 +39,6 @@ #undef EFI_CONSOLE_RX_BRAIN_PIN #define EFI_CONSOLE_RX_BRAIN_PIN Gpio::A10 -#undef EFI_USE_OSC -#define EFI_USE_OSC TRUE - #undef EFI_CAN_SUPPORT #define EFI_CAN_SUPPORT TRUE diff --git a/firmware/config/boards/core8/board.h b/firmware/config/boards/core8/board.h index 9d0f0758ce..b04202d280 100644 --- a/firmware/config/boards/core8/board.h +++ b/firmware/config/boards/core8/board.h @@ -39,9 +39,6 @@ #undef EFI_CONSOLE_RX_BRAIN_PIN #define EFI_CONSOLE_RX_BRAIN_PIN Gpio::A10 -#undef EFI_USE_OSC -#define EFI_USE_OSC TRUE - #undef EFI_CAN_SUPPORT #define EFI_CAN_SUPPORT TRUE diff --git a/firmware/config/boards/hellen/hellen-common.mk b/firmware/config/boards/hellen/hellen-common.mk index 73208867c2..cd5518fcf9 100644 --- a/firmware/config/boards/hellen/hellen-common.mk +++ b/firmware/config/boards/hellen/hellen-common.mk @@ -11,6 +11,5 @@ DDEFS += -DLED_COMMUNICATION_BRAIN_PIN_MODE=INVERTED_OUTPUT # We are running on Hellen-One hardware! DDEFS += -DHW_HELLEN=1 -DDEFS += -DEFI_USE_OSC=TRUE DDEFS += -DTS_NO_SECONDARY=TRUE diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index f2968f9203..b7b87a5fea 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -28,7 +28,6 @@ DDEFS += -DEFI_CAN_SERIAL=TRUE DDEFS += -DEFI_CJ125=FALSE -DBOARD_L9779_COUNT=0 -DEFI_HD44780_LCD=FALSE -DEFI_LCD=FALSE -DDEFS += -DEFI_USE_OSC=TRUE DDEFS += -DFIRMWARE_ID=\"microRusEFI\" DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE DDEFS += $(VAR_DEF_ENGINE_TYPE) diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh index 8622148aeb..b9e1e48af9 100644 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh @@ -5,8 +5,11 @@ SCRIPT_NAME="compile_nucleo_f767.sh" echo "Entering $SCRIPT_NAME" +# Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS + export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \ -DEFI_INJECTOR_PIN3=Gpio::Unassigned \ + -DSTM32_HSE_BYPASS=TRUE \ -DFIRMWARE_ID=\\\"nucleo767\\\" \ -DEFI_COMMUNICATION_PIN=Gpio::B7 \ -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::B14 \ diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh index 5ba6d4657c..9cdd40bdea 100644 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh @@ -8,7 +8,6 @@ export EXTRA_PARAMS="-DDUMMY -DSTM32F767xx \ -DEFI_COMMUNICATION_PIN=Gpio::B7 \ -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::B14 \ -DEFI_ENABLE_ASSERTS=FALSE \ - -DEFI_USE_OSC=TRUE \ -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" # Do not forget to comment out following line if looking to debug! diff --git a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh index ed74884890..cfc6679dc2 100644 --- a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh +++ b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh @@ -5,8 +5,11 @@ SCRIPT_NAME="compile_nucleo_h743.sh" echo "Entering $SCRIPT_NAME" +# Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS + export EXTRA_PARAMS="-DDUMMY \ -DEFI_INJECTOR_PIN3=Gpio::Unassigned \ + -DSTM32_HSE_BYPASS=TRUE \ -DFIRMWARE_ID=\\\"nucleoH743\\\" \ -DEFI_COMMUNICATION_PIN=Gpio::B7 \ -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::B14" diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 63642d6399..6983f49940 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -8,7 +8,6 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F4) IS_STM32F429 = yes endif -DDEFS += -DEFI_USE_OSC=TRUE # see also openblt/board.mk STATUS_LED DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::E3 DDEFS += -DFIRMWARE_ID=\"proteus\" diff --git a/firmware/config/boards/skeleton/board.mk b/firmware/config/boards/skeleton/board.mk index b0945d24c3..738880850a 100644 --- a/firmware/config/boards/skeleton/board.mk +++ b/firmware/config/boards/skeleton/board.mk @@ -10,4 +10,4 @@ endif DDEFS += -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO # Add them all together -DDEFS += -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::E3 -DFIRMWARE_ID=\"skeleton\" +DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=Gpio::E3 -DFIRMWARE_ID=\"skeleton\" diff --git a/firmware/hw_layer/ports/stm32/stm32f7/board.h b/firmware/hw_layer/ports/stm32/stm32f7/board.h index e26f031de5..bc22c66f95 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/board.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/board.h @@ -54,12 +54,6 @@ #define STM32_LSEDRV (3U << 3U) -// Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS -// if you do not have Sl-Link and MCO on your board, you need EFI_USE_OSC - -#ifndef EFI_USE_OSC -#define STM32_HSE_BYPASS -#endif /* EFI_USE_OSC */ /* * Board voltages. diff --git a/firmware/hw_layer/ports/stm32/stm32h7/board.h b/firmware/hw_layer/ports/stm32/stm32h7/board.h index 7323473dc0..dc046fec29 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/board.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/board.h @@ -66,13 +66,6 @@ #define STM32_HSECLK 8000000U #endif -// Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS -// if you do not have Sl-Link and MCO on your board, you need EFI_USE_OSC - -#ifndef EFI_USE_OSC -#define STM32_HSE_BYPASS -#endif /* EFI_USE_OSC */ - /* * Board voltages. * Required for performance limits calculation.