diff options
author | Jett Rink <jettrink@chromium.org> | 2018-05-01 14:22:04 -0600 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-05-02 22:20:31 -0700 |
commit | e47daed322ef8fa6aa9dd0396d55d9b5a99a9c3b (patch) | |
tree | 3e1db3561f5ac8a96ba2aecb46a6c211f4a191b5 /board/yorp/board.h | |
parent | 2c7d0bad3755383e1a849b18e373c2618611a267 (diff) | |
download | chrome-ec-e47daed322ef8fa6aa9dd0396d55d9b5a99a9c3b.tar.gz |
octopus: move common CONFIG defines into baseboard
The `make BOARD=yorp print-configs` and bip version
show no diff before and after this change.
BRANCH=none
BUG=none
TEST=verify the print-configs output does not change.
Change-Id: If2cdc39b685f529ece707b9831052daf58e91dfa
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1038898
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Vijay Hiremath <vijay.p.hiremath@intel.corp-partner.google.com>
Diffstat (limited to 'board/yorp/board.h')
-rw-r--r-- | board/yorp/board.h | 151 |
1 files changed, 6 insertions, 145 deletions
diff --git a/board/yorp/board.h b/board/yorp/board.h index 163d86986c..16e4b5dab0 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -8,39 +8,13 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H +/* Select Baseboard features */ +#define OCTOPUS_EC_NPCX796FB +#define OCTOPUS_CHARGER_ISL9238 +#include "baseboard.h" + /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ -#define CONFIG_CMD_PPC_DUMP - -/* NPCX7 config */ -#define NPCX_UART_MODULE2 1 /* GPIO64/65 are used as UART pins. */ -#define NPCX_TACH_SEL2 0 /* [0:GPIO40/73, 1:GPIO93/A6] as TACH */ -#define NPCX7_PWM1_SEL 0 /* GPIO C2 is not used as PWM1. */ - -/* Internal SPI flash on NPCX7 */ -/* Flash is 1MB but reserve half for future use. */ -#define CONFIG_FLASH_SIZE (512 * 1024) - -#define CONFIG_SPI_FLASH_REGS -#define CONFIG_SPI_FLASH_W25Q128 /* Internal SPI flash type. */ - -/* EC Features */ -#define CONFIG_I2C -#define CONFIG_I2C_MASTER -#define CONFIG_VBOOT_HASH -#define CONFIG_VSTORE -#define CONFIG_VSTORE_SLOT_COUNT 1 -#define CONFIG_BOARD_VERSION_CBI -#define CONFIG_CRC8 -#define CONFIG_CROS_BOARD_INFO -#define CONFIG_LOW_POWER_IDLE - -/* Keyboard */ -#define CONFIG_CMD_KEYBOARD -#define CONFIG_KEYBOARD_BOARD_CONFIG -#define CONFIG_KEYBOARD_PROTOCOL_8042 -#define CONFIG_KEYBOARD_COL2_INVERTED -#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2 /* EC console commands */ #define CONFIG_CMD_ACCELS @@ -48,83 +22,10 @@ #define CONFIG_LED_COMMON -/* Charger Configuration */ -#define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGE_RAMP_HW -#define CONFIG_CHARGER -#define CONFIG_CHARGER_V2 -#define CONFIG_CHARGER_ISL9238 -#define CONFIG_CHARGER_INPUT_CURRENT 512 /* Allow low-current USB charging */ -#define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 -#define CONFIG_CHARGER_DISCHARGE_ON_AC -#define CONFIG_USB_CHARGER - -/* Battery Configuration */ -#define CONFIG_BATTERY_CUT_OFF -#define CONFIG_BATTERY_DEVICE_CHEMISTRY "LION" -/* TODO(b/74427009): Ensure this works in dead battery conditions */ -#define CONFIG_BATTERY_HW_PRESENT_CUSTOM -#define CONFIG_BATTERY_PRESENT_CUSTOM -#define CONFIG_BATTERY_SMART - -/* USB-C Configuration */ -#define CONFIG_USB_POWER_DELIVERY -#define CONFIG_USB_PD_PORT_COUNT 2 -#define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 -#define CONFIG_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_ALT_MODE -#define CONFIG_USB_PD_ALT_MODE_DFP -#define CONFIG_USB_PD_COMM_LOCKED -#define CONFIG_USB_PD_DISCHARGE_PPC -/* - * TODO(b/77544959): This mode doe not work with ANX7447 currently and floods - * the EC console with low power mode messages. - */ -#undef CONFIG_USB_PD_TCPC_LOW_POWER -#undef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_TCPM_ANX7447 /* C0 TCPC: ANX7447QN */ -#define CONFIG_USB_PD_TCPM_ANX7447_OCM_ERASE_COMMAND -#define CONFIG_USB_PD_TCPM_PS8751 /* C1 TCPC: PS8751 */ -#define CONFIG_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TCPM_TCPCI -#define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_PD_VBUS_DETECT_TCPC -#define CONFIG_USBC_SS_MUX -#define CONFIG_USBC_SS_MUX_DFP_ONLY -#define CONFIG_USBC_PPC_NX20P3483 -#define CONFIG_USBC_VCONN -#define CONFIG_USBC_VCONN_SWAP -#define CONFIG_CMD_PD_CONTROL -#define CONFIG_BC12_DETECT_BQ24392 -#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT - /* USB-A Configuration */ -#define CONFIG_USB_PORT_POWER_DUMB +#undef USB_PORT_COUNT #define USB_PORT_COUNT 1 /* TODO(b/74388692): Make 2 after hardware fix. */ -/* TODO(b/74244817): Use correct PD delay values */ -#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ -#define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ - -/* TODO(b/74244817): Use correct PD power values */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 45000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - -/* I2C Bus Configuration */ -#define I2C_PORT_BATTERY NPCX_I2C_PORT0_0 -#define I2C_PORT_TCPC0 NPCX_I2C_PORT1_0 -#define I2C_PORT_TCPC1 NPCX_I2C_PORT2_0 -#define I2C_PORT_EEPROM NPCX_I2C_PORT3_0 -#define I2C_PORT_CHARGER NPCX_I2C_PORT4_1 -#define I2C_PORT_SENSOR NPCX_I2C_PORT7_0 -#define I2C_ADDR_EEPROM 0xA0 - /* Sensors */ #define CONFIG_ACCEL_KX022 /* Lid accel */ #define CONFIG_ACCELGYRO_LSM6DSM /* Base accel */ @@ -137,27 +38,8 @@ #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL -/* SoC / PCH */ -#define CONFIG_CHIPSET_GEMINILAKE -#define CONFIG_CHIPSET_RESET_HOOK -#define CONFIG_ESPI -/* TODO(b/74123961): Enable Virtual Wires after bringup */ -#define CONFIG_LPC -#define CONFIG_POWER_COMMON -#define CONFIG_POWER_S0IX -#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE -#define CONFIG_POWER_BUTTON -#define CONFIG_POWER_BUTTON_X86 -#define CONFIG_POWER_PP5000_CONTROL #define CONFIG_TEMP_SENSOR #define CONFIG_THERMISTOR_NCP15WB -#define CONFIG_EXTPOWER_GPIO -#undef CONFIG_EXTPOWER_DEBOUNCE_MS -/* - * ISL923x driver sets "Adapter insertion to Switching Debounce" - * CONTROL2 REG 0x3DH <Bit 11> to 1 which is 150 ms - */ -#define CONFIG_EXTPOWER_DEBOUNCE_MS 200 #ifndef __ASSEMBLER__ @@ -173,23 +55,6 @@ enum adc_channel { ADC_CH_COUNT }; -enum power_signal { -#ifdef CONFIG_POWER_S0IX - X86_SLP_S0_N, /* PCH -> SLP_S0_L */ -#endif - X86_SLP_S3_N, /* PCH -> SLP_S3_L */ - X86_SLP_S4_N, /* PCH -> SLP_S4_L */ - X86_SUSPWRDNACK, /* PCH -> SUSPWRDNACK */ - - X86_ALL_SYS_PG, /* PMIC -> PMIC_EC_PWROK_OD */ - X86_RSMRST_N, /* PMIC -> PMIC_EC_RSMRST_ODL */ - X86_PGOOD_PP3300, /* PMIC -> PP3300_PG_OD */ - X86_PGOOD_PP5000, /* PMIC -> PP5000_PG_OD */ - - /* Number of X86 signals */ - POWER_SIGNAL_COUNT -}; - enum temp_sensor_id { TEMP_SENSOR_AMBIENT = 0, TEMP_SENSOR_CHARGER, @@ -212,10 +77,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -/* Forward declare board-specific functions */ -void board_reset_pd_mcu(void); -int board_get_version(void); - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ |