diff options
| author | Martin Roth <martinroth@chromium.org> | 2021-05-20 17:22:28 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-06-10 21:33:56 +0000 |
| commit | 455e07e7f3f42b2ce866ae6a8f243361a77dd5e5 (patch) | |
| tree | 2012061cc1a9609266391b2388a1c2c4c685ea1d /src | |
| parent | 494a5dd7f509c4d77abf4ac9911eeb8db2c10ac0 (diff) | |
mb/google/guybrush: Move variant_has_fpmcu() after eSPI init
Currently variant_has_fpmcu() is called very early in bootblock, before
eSPI is initialized. When checking CBI for its presence, that causes
an error and nothing else can be read from CBI in bootblock.
Moving it slightly later in bootblock doesn't hurt anything from a
timing standpoint, and allows CBI to be read.
BUG=None
TEST=See CBI get read and the FPMCU field read correctly.
Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: I6de44119e92c8820b266f9f07287706c7d4eb505
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54740
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/guybrush/bootblock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mainboard/google/guybrush/bootblock.c b/src/mainboard/google/guybrush/bootblock.c index 5b18d37cc6..46875ff43d 100644 --- a/src/mainboard/google/guybrush/bootblock.c +++ b/src/mainboard/google/guybrush/bootblock.c @@ -34,7 +34,11 @@ void bootblock_mainboard_early_init(void) dword = pm_read32(0x74); dword |= 3 << 10; pm_write32(0x74, dword); +} +void bootblock_mainboard_init(void) +{ + /* Put FPMCU check after EC initialization */ if (variant_has_fpmcu()) variant_fpmcu_reset(); } |