Too much was stuffed into poor f407 discovery configuration

firmware/config/boards/f407-discovery/board.mk

@@ -15,18 +15,16 @@ else
   DDEFS += -D$(FW_ID_ENV)
 endif
 
-DDEFS += -DEFI_SENT_SUPPORT=TRUE
-
 # User can configure LIN/K-line interface
-DDEFS += -DEFI_KLINE=TRUE
-DDEFS += -DKLINE_SERIAL_DEVICE_RX=Gpio::C11 -DKLINE_SERIAL_DEVICE_TX=Gpio::C10
-DDEFS += -DKLINE_SERIAL_DEVICE=SD3
+#DDEFS += -DEFI_KLINE=TRUE
+#DDEFS += -DKLINE_SERIAL_DEVICE_RX=Gpio::C11 -DKLINE_SERIAL_DEVICE_TX=Gpio::C10
+#DDEFS += -DKLINE_SERIAL_DEVICE=SD3
 
 # DAC channel1 PA4
 # DAC channel2 PA5
-DDEFS += -DEFI_DAC=TRUE -DHAL_USE_DAC=TRUE -DSTM32_DAC_USE_DAC1_CH1=TRUE -DSTM32_DAC_USE_DAC1_CH2=TRUE
+#DDEFS += -DEFI_DAC=TRUE -DHAL_USE_DAC=TRUE -DSTM32_DAC_USE_DAC1_CH1=TRUE -DSTM32_DAC_USE_DAC1_CH2=TRUE
 
-DDEFS += -DBOARD_TLE9104_COUNT=2
+#DDEFS += -DBOARD_TLE9104_COUNT=2
 # EGT chip
 DDEFS += -DEFI_MAX_31855=TRUE
 
@@ -38,9 +36,7 @@ DDEFS += $(DEFAULT_ENGINE_TYPE)
 
 DDEFS += -DSTM32_ADC_USE_ADC3=TRUE
 # todo: make knock pin software-selectable?
-# todo: DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE
-
-DDEFS += -DEFI_SENT_SUPPORT=TRUE
+DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 
 DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F407_DISCOVERY
 
@@ -48,14 +44,10 @@ DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_F407_DISCOVERY
 DDEFS += -DSTM32_SERIAL_USE_USART3=TRUE -DSTM32_SERIAL_USART3_PRIORITY=2
 DDEFS += -DTS_SECONDARY_UxART_PORT=SD3 -DEFI_TS_SECONDARY_IS_SERIAL=TRUE
 
-DDEFS += -DSTM32_I2C_USE_I2C3=TRUE
-
-DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
-
-DDEFS += -DEFI_WS2812=TRUE
+#DDEFS += -DEFI_WS2812=TRUE
 
 ifndef IS_RE_BOOTLOADER
-DDEFS += -DHAL_USE_EEPROM=TRUE
+#DDEFS += -DHAL_USE_EEPROM=TRUE -DSTM32_I2C_USE_I2C3=TRUE
 endif
 
 # This board has some Accelerometer onboard

firmware/config/boards/hellen/alphax-8chan/board.mk

@@ -10,6 +10,8 @@ DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
 # MM176_GP9
 DDEFS += -DADC_MUX_PIN=Gpio::F2
 
+DDEFS += -DEFI_SENT_SUPPORT=TRUE
+
 LED_CRITICAL_ERROR_BRAIN_PIN = -DLED_CRITICAL_ERROR_BRAIN_PIN=H176_MCU_MEGA_LED1_RED
 include $(BOARDS_DIR)/hellen/hellen-common176.mk
 

firmware/config/engines/custom_engine.cpp

@@ -210,8 +210,7 @@ void setEtbTestConfiguration() {
 	// see also setDefaultEtbBiasCurve
 }
 
-#if defined(HW_FRANKENSO) && EFI_PROD_CODE
-
+#if defined(HW_FRANKENSO) && EFI_PROD_CODE && HAL_USE_EEPROM
 
 // todo: page_size + 2
 // todo:  CC_SECTION(".nocache")
@@ -268,8 +267,6 @@ void setEepromTestConfiguration() {
 
 
     		});
-
-
 }
 #endif //HW_FRANKENSO
 

firmware/controllers/algo/engine_configuration.cpp

@@ -1005,7 +1005,7 @@ void resetConfigurationExt(configuration_callback_t boardCallback, engine_type_e
 		setL9779TestConfiguration();
 		break;
 	case engine_type_e::EEPROM_BENCH_ENGINE:
-#if EFI_PROD_CODE
+#if EFI_PROD_CODE && HAL_USE_EEPROM
 		setEepromTestConfiguration();
 #endif
 		break;