diff options
| author | Zhuohao Lee <zhuohao@chromium.org> | 2018-11-26 12:22:29 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-12-06 22:06:27 -0800 |
| commit | 6b1c8f10329d1d335aa5c1a3365973d4250e2519 (patch) | |
| tree | f574302b2f55990210863be1cb891cb7b60a3def | |
| parent | 368d1eb5564a891c0f4cc3ae0983a3430075369a (diff) | |
| download | chrome-ec-6b1c8f10329d1d335aa5c1a3365973d4250e2519.tar.gz | |
rammus: Lock the EC
This patch removes the CONFIG_SYSTEM_UNLOCKED to lock the EC and
adds the CONFIG_USB_PD_COMM_LOCKED to enable USB PD only when EC
is in RW.
BUG=b:111816190,b:119929973
BRANCH=master
TEST=make buildall -j pass
Change-Id: Id812a4036b9a72e60d72a67d4cf4541aa84d5940
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1350509
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | board/rammus/board.h | 7 | ||||
| -rw-r--r-- | board/rammus/gpio.inc | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/board/rammus/board.h b/board/rammus/board.h index dec50b87d1..2e2fa5bef0 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -8,12 +8,6 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -/* - * Allow dangerous commands. - * TODO(b:111816190): Remove this config before production. - */ -#define CONFIG_SYSTEM_UNLOCKED - /* EC */ #define CONFIG_ADC #define CONFIG_BACKLIGHT_LID @@ -141,6 +135,7 @@ #define CONFIG_USB_CHARGER #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP +#define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE diff --git a/board/rammus/gpio.inc b/board/rammus/gpio.inc index 9176414cfc..1a8f076aba 100644 --- a/board/rammus/gpio.inc +++ b/board/rammus/gpio.inc @@ -95,7 +95,6 @@ GPIO(USB_A_CHARGE_EN_L, PIN(0, 0), GPIO_OUT_LOW) GPIO(EN_USB_A_5V, PIN(8, 4), GPIO_OUT_LOW) /* LEDs */ -/* TODO(b:111815820): Need to modify the LED setting later */ GPIO(CHG_LED1, PIN(8, 0), GPIO_OUT_LOW) GPIO(CHG_LED2, PIN(B, 7), GPIO_OUT_LOW) GPIO(PWR_LED, PIN(8, 6), GPIO_OUT_LOW) |