Hellen says merge #1772 efifeatures
This commit is contained in:
parent
0dafcacde4
commit
d424720ceb
|
@ -340,6 +340,7 @@
|
|||
#define LED_WARNING_BRAIN_PIN GPIOD_13
|
||||
|
||||
#define LED_ERROR_BRAIN_PIN GPIOD_14
|
||||
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
|
||||
|
||||
#define EFI_WARNING_LED FALSE
|
||||
|
||||
|
|
|
@ -88,6 +88,8 @@
|
|||
|
||||
#undef LED_ERROR_BRAIN_PIN
|
||||
#define LED_ERROR_BRAIN_PIN GPIOA_13
|
||||
#undef LED_ERROR_BRAIN_PIN_MODE
|
||||
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
|
||||
|
||||
#undef CONSOLE_MODE_SWITCH_PORT
|
||||
#undef CONFIG_RESET_SWITCH_PORT
|
||||
|
|
|
@ -118,6 +118,10 @@
|
|||
#define HAL_TRIGGER_USE_PAL FALSE
|
||||
#endif /* HAL_TRIGGER_USE_PAL */
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_ADC
|
||||
#define HAL_TRIGGER_USE_ADC FALSE
|
||||
#endif /* HAL_TRIGGER_USE_ADC */
|
||||
|
||||
// TunerStudio support.
|
||||
#define EFI_TUNER_STUDIO TRUE
|
||||
#define EFI_TUNER_STUDIO_VERBOSE TRUE // Debugging output
|
||||
|
@ -335,6 +339,9 @@
|
|||
#ifndef LED_ERROR_BRAIN_PIN
|
||||
#define LED_ERROR_BRAIN_PIN GPIOD_14
|
||||
#endif
|
||||
#ifndef LED_ERROR_BRAIN_PIN_MODE
|
||||
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
|
||||
#endif
|
||||
|
||||
// USART1 -> check defined STM32_SERIAL_USE_USART1
|
||||
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
|
||||
|
@ -376,7 +383,7 @@
|
|||
#undef TS_SERIAL_DEVICE
|
||||
#undef TS_UART_MODE
|
||||
#define EFI_CONSOLE_SERIAL_DEVICE (&SD1)
|
||||
//#define EFI_CONSOLE_SERIAL_DEVICE (&SDU1)
|
||||
//#define EFI_CONSOLE_USB_DEVICE (&SDU1)
|
||||
#define EFI_UART_ECHO_TEST_MODE TRUE
|
||||
#define TS_UART_DEVICE (&UARTD3)
|
||||
#define TS_SERIAL_DEVICE (&SD3)
|
||||
|
|
|
@ -80,6 +80,8 @@
|
|||
/* Red */
|
||||
#undef LED_ERROR_BRAIN_PIN
|
||||
#define LED_ERROR_BRAIN_PIN GPIOG_7
|
||||
#undef LED_ERROR_BRAIN_PIN_MODE
|
||||
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
|
||||
|
||||
/* no console switch */
|
||||
#undef CONSOLE_MODE_SWITCH_PORT
|
||||
|
|
|
@ -69,6 +69,10 @@
|
|||
#define HAL_TRIGGER_USE_PAL FALSE
|
||||
#endif /* HAL_TRIGGER_USE_PAL */
|
||||
|
||||
#ifndef HAL_TRIGGER_USE_ADC
|
||||
#define HAL_TRIGGER_USE_ADC FALSE
|
||||
#endif /* HAL_TRIGGER_USE_ADC */
|
||||
|
||||
/**
|
||||
* TunerStudio support.
|
||||
*/
|
||||
|
@ -144,8 +148,12 @@
|
|||
#define BOARD_TLE8888_COUNT 1
|
||||
#endif
|
||||
|
||||
#ifndef BOARD_DRV8860_COUNT
|
||||
#define BOARD_DRV8860_COUNT 0
|
||||
#endif
|
||||
|
||||
// todo: move this outside of efifeatures.h
|
||||
#define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT)
|
||||
#define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT + BOARD_DRV8860_COUNT)
|
||||
|
||||
// todo: move this outside of efifeatures.h
|
||||
#define BOARD_EXT_PINREPOPINS 24
|
||||
|
@ -242,6 +250,8 @@
|
|||
#define EFI_USB_SERIAL TRUE
|
||||
#endif
|
||||
|
||||
#define EFI_CONSOLE_USB_DEVICE (&SDU1)
|
||||
|
||||
/**
|
||||
* While we embed multiple PnP configurations into the same firmware binary, these marcoses give us control
|
||||
* over which configurations go into the binary
|
||||
|
@ -381,6 +391,9 @@
|
|||
#ifndef LED_ERROR_BRAIN_PIN
|
||||
#define LED_ERROR_BRAIN_PIN GPIOD_14
|
||||
#endif
|
||||
#ifndef LED_ERROR_BRAIN_PIN_MODE
|
||||
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
|
||||
#endif
|
||||
|
||||
// USART1 -> check defined STM32_SERIAL_USE_USART1
|
||||
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
|
||||
|
|
|
@ -49,8 +49,12 @@
|
|||
#define BOARD_TLE8888_COUNT 1
|
||||
#endif
|
||||
|
||||
#ifndef BOARD_DRV8860_COUNT
|
||||
#define BOARD_DRV8860_COUNT 0
|
||||
#endif
|
||||
|
||||
// todo: move this outside of efifeatures.h
|
||||
#define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT)
|
||||
#define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT + BOARD_DRV8860_COUNT)
|
||||
|
||||
|
||||
#undef EFI_CAN_SUPPORT
|
||||
|
|
Loading…
Reference in New Issue