diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2020-05-13 13:20:53 -0600 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-05-18 07:08:53 +0000 |
| commit | 8f694dd51f54c84a23251aeb175cb822da46cc9b (patch) | |
| tree | 2b0a264645f0d2d3debc5f696d137a771731e1fd | |
| parent | 022d935919e13e5ae0408348328387cd7ece7e66 (diff) | |
| download | coreboot-8f694dd51f54c84a23251aeb175cb822da46cc9b.tar.xz | |
arch/x86/early_ram.ld: Add vboot work buffer
This is required to enable VBOOT_STARTS_IN_BOOTBLOCK and
VBOOT_SEPARATE_VERSTAGE for picasso.
BUG=b:147042464
TEST=Boot verstage on picasso
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: Ic3e261a6919a78760d567be9cc684494a5aeab6d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41366
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/arch/x86/early_ram.ld | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/arch/x86/early_ram.ld b/src/arch/x86/early_ram.ld index cbf573f180..82bd775e9c 100644 --- a/src/arch/x86/early_ram.ld +++ b/src/arch/x86/early_ram.ld @@ -23,7 +23,7 @@ _FMAP_SIZE = 0; * The stack area is not shared between stages, but is defined here for * convenience. */ -. = CONFIG_X86_RESET_VECTOR - ARCH_STACK_ALIGN_SIZE - _STACK_SIZE - _CONSOLE_SIZE - _TIMESTAMPS_SIZE - _FMAP_SIZE; +. = CONFIG_X86_RESET_VECTOR - ARCH_STACK_ALIGN_SIZE - _STACK_SIZE - _CONSOLE_SIZE - _TIMESTAMPS_SIZE - _FMAP_SIZE - VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE; _ = ASSERT(. > _eprogram, "Not enough room for .earlyram.data. Try increasing C_ENV_BOOTBLOCK_SIZE, or decreasing either EARLYRAM_BSP_STACK_SIZE or PRERAM_CBMEM_CONSOLE_SIZE."); @@ -37,6 +37,11 @@ _ = ASSERT(. > _eprogram, "Not enough room for .earlyram.data. Try increasing C_ #if !CONFIG(NO_FMAP_CACHE) FMAP_CACHE(., FMAP_SIZE) #endif + + #if CONFIG(VBOOT_STARTS_IN_BOOTBLOCK) + ALIGN_COUNTER(16); + VBOOT2_WORK(., VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE) + #endif } _ = ASSERT(. <= CONFIG_X86_RESET_VECTOR, "Earlyram data regions don't fit below the reset vector!"); |