From e9c8d3850cee6d27d86a231aec75d0f24c09862a Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 1 Dec 2015 18:49:06 -0800 Subject: [PATCH] chell/glados/kunimitsu/tlars: Enable temporary host storage Enable the temporary secure storage feature for vboot on skylake. BUG=chrome-os-partner:46075 BRANCH=none TEST=tested on glados and chell with modifed coreboot Change-Id: Ic01888f7578e8e04bb39b38651bb646d1fc20750 Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/315223 Commit-Ready: Aaron Durbin Tested-by: Aaron Durbin Reviewed-by: Shawn N --- board/chell/board.h | 15 ++++++++++++--- board/glados/board.h | 17 +++++++++++++---- board/kunimitsu/board.h | 17 +++++++++++++---- board/lars/board.h | 15 ++++++++++++--- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/board/chell/board.h b/board/chell/board.h index b62b39bcf3..cf6563d483 100644 --- a/board/chell/board.h +++ b/board/chell/board.h @@ -8,6 +8,12 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H +/* + * Allow dangerous commands. + * TODO: Remove this config before production. + */ +#define CONFIG_SYSTEM_UNLOCKED + /* Optional features */ #define CONFIG_ADC #define CONFIG_BATTERY_CUT_OFF @@ -31,6 +37,7 @@ #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 #define CONFIG_CHIPSET_SKYLAKE +#define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CLOCK_CRYSTAL #define CONFIG_EXTPOWER_GPIO #define CONFIG_HOSTCMD_PD @@ -85,10 +92,12 @@ #define CONFIG_THERMISTOR_NCP15WB /* - * Allow dangerous commands. - * TODO: Remove this config before production. + * Enable 1 slot of secure temporary storage to support + * suspend/resume with read/write memory training. */ -#define CONFIG_SYSTEM_UNLOCKED +#define CONFIG_VSTORE +#define CONFIG_VSTORE_SLOT_COUNT 1 + #define CONFIG_WATCHDOG_HELP #define CONFIG_WIRELESS diff --git a/board/glados/board.h b/board/glados/board.h index 3f35b5c657..537126c765 100644 --- a/board/glados/board.h +++ b/board/glados/board.h @@ -8,6 +8,12 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H +/* + * Allow dangerous commands. + * TODO(shawnn): Remove this config before production. + */ +#define CONFIG_SYSTEM_UNLOCKED + /* Optional features */ #define CONFIG_ACCELGYRO_BMI160 #define CONFIG_ACCEL_KX022 @@ -37,6 +43,7 @@ #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 #define CONFIG_CHIPSET_SKYLAKE +#define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CLOCK_CRYSTAL #define CONFIG_EXTPOWER_GPIO #define CONFIG_HOSTCMD_PD @@ -93,10 +100,12 @@ #define CONFIG_THERMISTOR_NCP15WB /* - * Allow dangerous commands. - * TODO(shawnn): Remove this config before production. + * Enable 1 slot of secure temporary storage to support + * suspend/resume with read/write memory training. */ -#define CONFIG_SYSTEM_UNLOCKED +#define CONFIG_VSTORE +#define CONFIG_VSTORE_SLOT_COUNT 1 + #define CONFIG_WATCHDOG_HELP #define CONFIG_WIRELESS @@ -136,7 +145,7 @@ #undef CONFIG_CONSOLE_CMDHELP #undef DEFERRABLE_MAX_COUNT -#define DEFERRABLE_MAX_COUNT 14 +#define DEFERRABLE_MAX_COUNT 15 #ifndef __ASSEMBLER__ diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h index 4db8382b9f..10b877ca37 100644 --- a/board/kunimitsu/board.h +++ b/board/kunimitsu/board.h @@ -8,6 +8,12 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H +/* + * Allow dangerous commands. + * TODO: Remove this config before production. + */ +#define CONFIG_SYSTEM_UNLOCKED + /* Optional features */ #define CONFIG_ADC #define CONFIG_BATTERY_CUT_OFF @@ -43,6 +49,7 @@ #define ISL9237_C2_PSYS_GAIN_0_36 (100000000ul / (CHARGER_PSYS_RESISTOR * 36)) #define CONFIG_CHIPSET_SKYLAKE +#define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CLOCK_CRYSTAL #define CONFIG_EXTPOWER_GPIO #define CONFIG_FANS 1 @@ -97,10 +104,12 @@ #define CONFIG_TEMP_SENSOR_TMP432 /* - * Allow dangerous commands. - * TODO(shawnn): Remove this config before production. + * Enable 1 slot of secure temporary storage to support + * suspend/resume with read/write memory training. */ -#define CONFIG_SYSTEM_UNLOCKED +#define CONFIG_VSTORE +#define CONFIG_VSTORE_SLOT_COUNT 1 + #define CONFIG_WATCHDOG_HELP /* LED signals */ @@ -122,7 +131,7 @@ #define I2C_PORT_USB_CHARGER_2 MEC1322_I2C0_0 #undef DEFERRABLE_MAX_COUNT -#define DEFERRABLE_MAX_COUNT 14 +#define DEFERRABLE_MAX_COUNT 15 #define CONFIG_ALS #define CONFIG_ALS_OPT3001 diff --git a/board/lars/board.h b/board/lars/board.h index 8d1966dbb6..18815e9924 100644 --- a/board/lars/board.h +++ b/board/lars/board.h @@ -8,6 +8,12 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H +/* + * Allow dangerous commands. + * TODO: Remove this config before production. + */ +#define CONFIG_SYSTEM_UNLOCKED + /* Optional features */ #define CONFIG_ADC #define CONFIG_ALS @@ -45,6 +51,7 @@ #define ISL9237_C2_PSYS_GAIN_0_36 (100000000ul / (CHARGER_PSYS_RESISTOR * 36)) #define CONFIG_CHIPSET_SKYLAKE +#define CONFIG_CHIPSET_RESET_HOOK #define CONFIG_CLOCK_CRYSTAL #undef CONFIG_DEBUG_ASSERT #define CONFIG_EXTPOWER_GPIO @@ -101,10 +108,12 @@ #define CONFIG_TEMP_SENSOR_TMP432 /* - * Allow dangerous commands. - * TODO: Remove this config before production. + * Enable 1 slot of secure temporary storage to support + * suspend/resume with read/write memory training. */ -#define CONFIG_SYSTEM_UNLOCKED +#define CONFIG_VSTORE +#define CONFIG_VSTORE_SLOT_COUNT 1 + #define CONFIG_WATCHDOG_HELP /* I2C ports */