diff options
Diffstat (limited to 'board')
31 files changed, 36 insertions, 51 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h index 1ef45910c8..b381333a9e 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -25,8 +25,7 @@ /* EC */ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_DPTF #define CONFIG_FPU diff --git a/board/chell/board.h b/board/chell/board.h index ada855b016..ae5c4dc17f 100644 --- a/board/chell/board.h +++ b/board/chell/board.h @@ -20,7 +20,7 @@ #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART #define CONFIG_BOARD_HAS_RTC_RESET -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGE_RAMP_HW diff --git a/board/coral/board.h b/board/coral/board.h index 208bacdfb8..d063e6131f 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -114,8 +114,7 @@ /* EC */ #define CONFIG_ADC -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 diff --git a/board/elm/board.h b/board/elm/board.h index f066dfc67c..d07094b1d9 100644 --- a/board/elm/board.h +++ b/board/elm/board.h @@ -74,7 +74,7 @@ #define CONFIG_VBOOT_HASH #undef CONFIG_WATCHDOG_HELP #define CONFIG_SWITCH -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #undef CONFIG_UART_CONSOLE #define CONFIG_UART_CONSOLE 1 #define CONFIG_TEMP_SENSOR diff --git a/board/eve/board.h b/board/eve/board.h index e8fa791505..727986e7c1 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -25,8 +25,7 @@ /* EC */ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_DEVICE_EVENT #define CONFIG_DPTF diff --git a/board/fizz/board.h b/board/fizz/board.h index 464b517db8..b4ed5a19ae 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -17,8 +17,7 @@ /* EC */ #define CONFIG_ADC -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 #define CONFIG_CROS_BOARD_INFO #define CONFIG_DEDICATED_RECOVERY_BUTTON @@ -239,7 +238,6 @@ enum mft_channel { #define PD_MAX_VOLTAGE_MV 20000 /* Board specific handlers */ -int board_get_version(void); void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); int board_get_battery_soc(void); diff --git a/board/glados/board.h b/board/glados/board.h index cec7d50abd..605551fea6 100644 --- a/board/glados/board.h +++ b/board/glados/board.h @@ -22,7 +22,7 @@ #define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_CHARGE_MANAGER #define CONFIG_CHARGE_RAMP_HW diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h index 2236285087..91ac5c2c45 100644 --- a/board/glkrvp/board.h +++ b/board/glkrvp/board.h @@ -86,8 +86,7 @@ #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE /* EC */ -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_VOLUME_BUTTONS #define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL #define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL diff --git a/board/glkrvp_ite/board.h b/board/glkrvp_ite/board.h index d21b6c4cdb..802b9beefe 100644 --- a/board/glkrvp_ite/board.h +++ b/board/glkrvp_ite/board.h @@ -86,8 +86,7 @@ #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE /* EC */ -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_VOLUME_BUTTONS #define CONFIG_LID_SWITCH #define CONFIG_WP_ALWAYS diff --git a/board/grunt/board.h b/board/grunt/board.h index 98fcc9823b..10ad79bbfd 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -33,7 +33,7 @@ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID #define CONFIG_BACKLIGHT_LID_ACTIVE_LOW -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_HOSTCMD_SKUID #define CONFIG_I2C #define CONFIG_I2C_MASTER diff --git a/board/it83xx_evb/board.h b/board/it83xx_evb/board.h index 234d9fd5bc..8da6cf79d0 100644 --- a/board/it83xx_evb/board.h +++ b/board/it83xx_evb/board.h @@ -13,7 +13,7 @@ /* Optional features */ #define CONFIG_BATTERY_SMART -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_FANS 1 #define CONFIG_I2C #define CONFIG_I2C_MASTER diff --git a/board/kahlee/board.h b/board/kahlee/board.h index 224299768b..d77b89bb29 100644 --- a/board/kahlee/board.h +++ b/board/kahlee/board.h @@ -93,8 +93,7 @@ /* EC */ #define CONFIG_ADC -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 diff --git a/board/kevin/board.h b/board/kevin/board.h index 39c4c24f28..221a5de29b 100644 --- a/board/kevin/board.h +++ b/board/kevin/board.h @@ -48,8 +48,7 @@ #define CONFIG_RAM_SIZE (CONFIG_DATA_RAM_SIZE - 0x800) /* Optional features */ -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_FLASH_SIZE 0x00080000 /* 512KB spi flash */ #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_HOSTCMD_SECTION_SORTED /* Host commands are sorted. */ diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index 529bc5e35a..679bd3b44f 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -143,7 +143,7 @@ #define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_BUTTON_COUNT 2 /* #define CONFIG_CHARGE_MANAGER */ /* #define CONFIG_CHARGE_RAMP_SW */ diff --git a/board/nami/board.h b/board/nami/board.h index 63481f315a..f086fbd109 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -18,8 +18,7 @@ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID #define CONFIG_BACKLIGHT_LID_ACTIVE_LOW -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CBI #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_CRC8 #define CONFIG_CROS_BOARD_INFO @@ -282,7 +281,6 @@ enum oem_id { #define PD_MAX_VOLTAGE_MV 20000 /* Board specific handlers */ -int board_get_version(void); void board_reset_pd_mcu(void); void board_set_tcpc_power_mode(int port, int mode); diff --git a/board/nautilus/board.h b/board/nautilus/board.h index d516cde646..2b8f7e71e8 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -17,8 +17,7 @@ /* EC */ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL #define CONFIG_DPTF diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h index 4370cf5fbb..2449b07636 100644 --- a/board/npcx7_evb/board.h +++ b/board/npcx7_evb/board.h @@ -26,7 +26,7 @@ #define CONFIG_ESPI_VW_SIGNALS /* Use VW signals instead of GPIOs */ /* Optional features */ -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_EXTPOWER_GPIO #define CONFIG_I2C_MASTER #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index 8c26e48e4c..b5dab2a370 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -29,7 +29,7 @@ #define CONFIG_POWER_BUTTON #define CONFIG_VBOOT_HASH #define CONFIG_PWM_KBLIGHT -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO /* Optional features for test commands */ #define CONFIG_CMD_TASKREADY diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index ee6a691e1c..c6c09b1c58 100644 --- a/board/npcx_evb_arm/board.h +++ b/board/npcx_evb_arm/board.h @@ -25,7 +25,7 @@ #define CONFIG_POWER_BUTTON #define CONFIG_VBOOT_HASH #define CONFIG_PWM_KBLIGHT -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO /* Optional features for test commands */ #define CONFIG_CMD_TASKREADY diff --git a/board/oak/board.h b/board/oak/board.h index f7324effe1..3bba4a1f44 100644 --- a/board/oak/board.h +++ b/board/oak/board.h @@ -105,7 +105,7 @@ #define CONFIG_VBOOT_HASH #undef CONFIG_WATCHDOG_HELP #define CONFIG_SWITCH -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #undef CONFIG_UART_CONSOLE #define CONFIG_UART_CONSOLE 1 #define CONFIG_TEMP_SENSOR diff --git a/board/poppy/board.h b/board/poppy/board.h index fbdf6e86e3..033e6388e4 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -17,8 +17,7 @@ /* EC */ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BOARD_FORCE_RESET_PIN #define CONFIG_BUTTON_TRIGGERED_RECOVERY #define CONFIG_DPTF diff --git a/board/rainier/board.h b/board/rainier/board.h index 833352482d..ff2a5b26d6 100644 --- a/board/rainier/board.h +++ b/board/rainier/board.h @@ -41,8 +41,7 @@ /* Optional features */ #define CONFIG_BOARD_PRE_INIT -#define CONFIG_BOARD_SPECIFIC_VERSION -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BUTTON_TRIGGERED_RECOVERY #define CONFIG_CHARGER_ILIM_PIN_DISABLED #define CONFIG_FORCE_CONSOLE_RESUME diff --git a/board/reef/board.h b/board/reef/board.h index d9dfb78e92..a3060be05f 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -112,8 +112,7 @@ /* EC */ #define CONFIG_ADC -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h index 879130f4c3..262a831b16 100644 --- a/board/reef_it8320/board.h +++ b/board/reef_it8320/board.h @@ -97,8 +97,7 @@ /* EC */ #define CONFIG_ADC -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_EXTPOWER_GPIO #undef CONFIG_EXTPOWER_DEBOUNCE_MS #define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 diff --git a/board/samus/board.h b/board/samus/board.h index f21f8a874f..1e0b73179e 100644 --- a/board/samus/board.h +++ b/board/samus/board.h @@ -19,7 +19,7 @@ #define CONFIG_ACCEL_KXCJ9 #define CONFIG_ACCEL_STD_REF_FRAME_OLD #define CONFIG_ALS_ISL29035 -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_CMD_ACCELS #define CONFIG_CMD_ACCEL_INFO #undef CONFIG_BATTERY_CRITICAL_SHUTDOWN_TIMEOUT diff --git a/board/scarlet/board.h b/board/scarlet/board.h index d7fe301b60..653b6513fc 100644 --- a/board/scarlet/board.h +++ b/board/scarlet/board.h @@ -46,8 +46,7 @@ /* Optional features */ #define CONFIG_BOARD_PRE_INIT -#define CONFIG_BOARD_SPECIFIC_VERSION -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM #define CONFIG_BUTTON_TRIGGERED_RECOVERY #define CONFIG_CHARGER_ILIM_PIN_DISABLED #define CONFIG_FORCE_CONSOLE_RESUME diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index f28c2f8902..65206dd772 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -15,8 +15,7 @@ * id from previous versions. */ #define BOARD_VERSION_BLACK 3 -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM /* 48 MHz SYSCLK clock frequency */ #define CPU_CLOCK 48000000 diff --git a/board/strago/board.h b/board/strago/board.h index b7faf53a12..64721ca95f 100644 --- a/board/strago/board.h +++ b/board/strago/board.h @@ -15,7 +15,7 @@ #define CONFIG_CHIPSET_BRASWELL #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_IRQ_GPIO GPIO_KBD_IRQ_L diff --git a/board/wheatley/board.h b/board/wheatley/board.h index 1dbe7a2376..ce4dfbdef1 100644 --- a/board/wheatley/board.h +++ b/board/wheatley/board.h @@ -16,7 +16,7 @@ #define CONFIG_BATTERY_CUT_OFF #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART -#define CONFIG_BOARD_VERSION +#define CONFIG_BOARD_VERSION_GPIO #define CONFIG_CHARGE_MANAGER #define CONFIG_BOARD_FORCE_RESET_PIN diff --git a/board/yorp/board.h b/board/yorp/board.h index be23cb116e..91605a6dfb 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -30,8 +30,7 @@ #define CONFIG_VBOOT_HASH #define CONFIG_VSTORE #define CONFIG_VSTORE_SLOT_COUNT 1 -#define CONFIG_BOARD_VERSION -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CBI #define CONFIG_CRC8 #define CONFIG_CROS_BOARD_INFO /* Keyboard */ diff --git a/board/zoombini/board.h b/board/zoombini/board.h index 4ed61302d6..aae8270f7d 100644 --- a/board/zoombini/board.h +++ b/board/zoombini/board.h @@ -75,9 +75,13 @@ #define CONFIG_BATTERY_REVIVE_DISCONNECT #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L -#define CONFIG_BOARD_VERSION #ifdef BOARD_MEOWTH -#define CONFIG_BOARD_SPECIFIC_VERSION +#define CONFIG_BOARD_VERSION_CUSTOM +#else +#define CONFIG_BOARD_VERSION_GPIO +#endif + +#ifdef BOARD_MEOWTH #define CONFIG_BUTTON_TRIGGERED_RECOVERY #endif /* defined(BOARD_MEOWTH) */ |