diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2020-06-03 04:43:30 +1000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-02 23:47:02 +0000 |
| commit | 88d0ae075d1e24338e7f5fca9dd3767ec5bd4023 (patch) | |
| tree | 1c4c3b361721a03b8966e9bc28b0711ff9380b06 /board | |
| parent | 5ae7720ca6599c89ad54614b36af5269340fe2fd (diff) | |
| download | chrome-ec-88d0ae075d1e24338e7f5fca9dd3767ec5bd4023.tar.gz | |
remove CR50_SQA
SQA images won't be built anymore. This change removes the SQA support.
It deletes all SQA ifdefs and replaces CR50_RELAXED with CR50_DEV.
BUG=b:158011401
TEST=manual
build regular image and check eraselfashinfo and rollback aren't
included.
build image with CR50_SQA=1 and check it's no different than the
regular image.
build DBG image and make sure it still starts open, it has the
eraseflashinfo and rollback commands, and it can flash old cr50
images.
Change-Id: I5e94c88b1903cfcf0eee0081fc871e55fc8586c7
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2227149
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/cr50/board.c | 2 | ||||
| -rw-r--r-- | board/cr50/board.h | 3 | ||||
| -rw-r--r-- | board/cr50/build.mk | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index e20810cd42..6843673662 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -1708,7 +1708,7 @@ static int command_board_properties(int argc, char **argv) DECLARE_SAFE_CONSOLE_COMMAND(brdprop, command_board_properties, NULL, "Display board properties"); -#ifdef CR50_RELAXED +#ifdef CR50_DEV static int command_rollback(int argc, char **argv) { system_ensure_rollback(); diff --git a/board/cr50/board.h b/board/cr50/board.h index 9f6833e5f1..fea738f7d2 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -117,9 +117,6 @@ #define CONFIG_CMD_FLASH_LOG #define CONFIG_PHYSICAL_PRESENCE_DEBUG_UNSAFE #endif -#if defined(CR50_DEV) || defined(CR50_SQA) -#define CR50_RELAXED -#endif #define CONFIG_USB_PID 0x5014 #define CONFIG_USB_SELF_POWERED diff --git a/board/cr50/build.mk b/board/cr50/build.mk index b84f2dc65f..0396ad6c17 100644 --- a/board/cr50/build.mk +++ b/board/cr50/build.mk @@ -18,7 +18,7 @@ ifeq ($(BOARD_MK_INCLUDED_ONCE),) # List of variables which can be defined in the environment or set in the make # command line. -ENV_VARS := CR50_DEV CR50_SQA CRYPTO_TEST H1_RED_BOARD +ENV_VARS := CR50_DEV CRYPTO_TEST H1_RED_BOARD ifneq ($(CRYPTO_TEST),) CPPFLAGS += -DCRYPTO_TEST_SETUP |