diff options
author | Scott Collyer <scollyer@google.com> | 2021-05-21 11:28:50 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-05-26 22:51:17 +0000 |
commit | aa1b46525d79aed93b4aadbffc3e1846c5bf94bd (patch) | |
tree | 536adef6bd5e7c16f49922cfbd061e15fadff0d4 | |
parent | 70d25ba53e492bd0f542a6e7e11f7035bb1b82ba (diff) | |
download | chrome-ec-aa1b46525d79aed93b4aadbffc3e1846c5bf94bd.tar.gz |
honeybuns: Move configs for MP release to board.h
This CL moves the configs that are needed to be changed for an MP
release to the board.h files from baseboard.h.
BUG=b:183686750
BRANCH=quiche
TEST=make BOARD=quiche/gingerbread/baklava
Signed-off-by: Scott Collyer <scollyer@google.com>
Change-Id: I7c602ecb2f2af02638be080613bb83dee568c332
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2911737
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Scott Collyer <scollyer@chromium.org>
-rw-r--r-- | baseboard/honeybuns/baseboard.h | 3 | ||||
-rw-r--r-- | board/baklava/board.h | 6 | ||||
-rw-r--r-- | board/gingerbread/board.h | 7 | ||||
-rw-r--r-- | board/quiche/board.h | 7 |
4 files changed, 20 insertions, 3 deletions
diff --git a/baseboard/honeybuns/baseboard.h b/baseboard/honeybuns/baseboard.h index 5ec8516249..401f2f59d0 100644 --- a/baseboard/honeybuns/baseboard.h +++ b/baseboard/honeybuns/baseboard.h @@ -11,9 +11,6 @@ /* EC Defines */ #define CONFIG_CRC8 -/* TODO Define FLASH_PSTATE_LOCKED prior to building MP FW. */ -#undef CONFIG_FLASH_PSTATE_LOCKED - /* Flash Lyaout */ /* * Flash layout: we redefine the sections offsets and sizes as we will use diff --git a/board/baklava/board.h b/board/baklava/board.h index c5737f8a40..5ae2cea560 100644 --- a/board/baklava/board.h +++ b/board/baklava/board.h @@ -12,7 +12,13 @@ #include "baseboard.h" /* Optional features */ +/* + * For MP release, CONFIG_SYSTEM_UNLOCKED must be undefined, and + * CONFIG_FLASH_PSTATE_LOCKED must be defined in order to enable write protect + * using option bytes WRP registers. + */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ +#undef CONFIG_FLASH_PSTATE_LOCKED /* USB Type C and USB PD defines */ #define USB_PD_PORT_HOST 0 diff --git a/board/gingerbread/board.h b/board/gingerbread/board.h index af962f4273..dd8b1fd6de 100644 --- a/board/gingerbread/board.h +++ b/board/gingerbread/board.h @@ -12,7 +12,14 @@ #include "baseboard.h" /* Optional features */ +/* + * For MP release, CONFIG_SYSTEM_UNLOCKED must be undefined, and + * CONFIG_FLASH_PSTATE_LOCKED must be defined in order to enable write protect + * using option bytes WRP registers. + */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ +#undef CONFIG_FLASH_PSTATE_LOCKED + #define CONFIG_WP_ACTIVE_HIGH diff --git a/board/quiche/board.h b/board/quiche/board.h index 15faabc1ed..ad8c70271d 100644 --- a/board/quiche/board.h +++ b/board/quiche/board.h @@ -12,7 +12,14 @@ #include "baseboard.h" /* Optional features */ +/* + * For MP release, CONFIG_SYSTEM_UNLOCKED must be undefined, and + * CONFIG_FLASH_PSTATE_LOCKED must be defined in order to enable write protect + * using option bytes WRP registers. + */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands while in dev. */ +#undef CONFIG_FLASH_PSTATE_LOCKED + /* USB Type C and USB PD defines */ #define USB_PD_PORT_HOST 0 |