diff options
author | Paul Fagerburg <pfagerburg@chromium.org> | 2019-08-05 15:17:38 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-06 17:39:30 +0000 |
commit | f9d396bf6d4466801549049642960db115a10870 (patch) | |
tree | fac7bdb49d38c7e8f6135798d68301abb20caa6f | |
parent | d3c9b9d123514742f1b5bed5d0ed9f379147b84b (diff) | |
download | chrome-ec-f9d396bf6d4466801549049642960db115a10870.tar.gz |
hatch: remove CONFIG_SYSTEM_UNLOCKED, enable CONFIG_USB_PD_COMM_LOCKED
Remove the CONFIG_SYSTEM_UNLOCKED option from some board
configurations and enable CONFIG_USB_PD_COMM_LOCKED. This allows
factory tests to verify the behavior, and also ensures that
developers and dogfooders are working with the same configs that
will be released to customers - "test what you fly and fly what
you test." Developers must remember to jump to RW before PD
will negotiate.
BRANCH=none
BUG=b:138868206
TEST=Rebuild and flash on hatch:
``cd ~/trunk/src/platform/ec``
``make -j BOARD=hatch``
``./util/flash_ec --board=hatch``
Connect to EC console via servo
Enable hardware write protect by connecting a battery
Verify software write protect is off via ``flashinfo``
Reboot the device
Look for "PD comm enabled" at the start of EC RO boot
Enable software write protect via ``flashwp true``
Verify software write protect is on via ``flashinfo``
Reboot the device
Look for "PD comm disabled" at the start of EC RO boot
Look for "PD comm enabled" at the start of EC RW boot
Shut down the device
Disconnect the AC adapter
Disconnect the battery
Boot the device
Disable software write protect via ``flashwp false``
Shut down the device
Disconnect the AC adapter
Connect the battery
Connect the AC adapter
Look for "PD comm enabled" at the start of EC RO boot
Verify software write protect is off via ``flashinfo``
Change-Id: Ibf999ee3ef948168dd05a40d9c002f93f32dc48c
Signed-off-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1737530
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Commit-Queue: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r-- | board/hatch/board.h | 4 | ||||
-rw-r--r-- | board/helios/board.h | 4 | ||||
-rw-r--r-- | board/kohaku/board.h | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/board/hatch/board.h b/board/hatch/board.h index c5d6da53bf..a56b3ad7e4 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -11,9 +11,6 @@ /* Baseboard features */ #include "baseboard.h" -/* Optional features */ -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ - #define CONFIG_POWER_BUTTON #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 @@ -52,6 +49,7 @@ #define I2C_PORT_ALS I2C_PORT_SENSOR /* USB Type C and USB PD defines */ +#define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_TCPM_ANX7447 #define CONFIG_USB_PD_TCPM_PS8751 #define BOARD_TCPC_C0_RESET_HOLD_DELAY ANX74XX_RESET_HOLD_MS diff --git a/board/helios/board.h b/board/helios/board.h index e609249bd4..13b4abc599 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -11,9 +11,6 @@ /* Baseboard features */ #include "baseboard.h" -/* Optional features */ -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ - #define CONFIG_POWER_BUTTON #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 @@ -51,6 +48,7 @@ #define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS /* USB Type C and USB PD defines */ +#define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_TCPM_PS8751 #define BOARD_TCPC_C0_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS #define BOARD_TCPC_C0_RESET_POST_DELAY 0 diff --git a/board/kohaku/board.h b/board/kohaku/board.h index f10da2ef58..ef2e2109a9 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -11,9 +11,6 @@ /* Baseboard features */ #include "baseboard.h" -/* Optional features */ -#define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ - #define CONFIG_POWER_BUTTON #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 @@ -79,6 +76,7 @@ #define BH1730_LUXTH4_D1_1K 149 /* USB Type C and USB PD defines */ +#define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_TCPM_PS8751 #define BOARD_TCPC_C0_RESET_HOLD_DELAY PS8XXX_RESET_DELAY_MS #define BOARD_TCPC_C0_RESET_POST_DELAY 0 |