diff options
| author | Julius Werner <jwerner@chromium.org> | 2017-03-16 19:32:48 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2017-03-28 22:14:43 +0200 |
| commit | fa8fa7dd540db7c6f363f75c12b2063c3cdc3908 (patch) | |
| tree | 0a24818a502d543cdcfa3b1ab3b7062eb935fadc /src/vboot/common.c | |
| parent | 94d9411415e624f70ba8451886e5b96a1f56b159 (diff) | |
vboot: Remove VBOOT_DYNAMIC_WORK_BUFFER Kconfig option
VBOOT_DYNAMIC_WORK_BUFFER and VBOOT_STARTS_IN_ROMSTAGE are equivalent in
practice. We can't have a dynamic work buffer unless we start in/after
romstage, and there'd be no reason to go with a static buffer if we do.
Let's get rid of one extra option and merge the two.
Change-Id: I3f953c8d2a8dcb3f65b07f548184d6dd0eb688fe
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/18979
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/vboot/common.c')
| -rw-r--r-- | src/vboot/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vboot/common.c b/src/vboot/common.c index cfdb82aa6a..3e480edbf6 100644 --- a/src/vboot/common.c +++ b/src/vboot/common.c @@ -46,7 +46,7 @@ static const size_t vb_work_buf_size = 16 * KiB; static struct vb2_working_data * const vboot_get_working_data(void) { - if (IS_ENABLED(CONFIG_VBOOT_DYNAMIC_WORK_BUFFER)) + if (IS_ENABLED(CONFIG_VBOOT_STARTS_IN_ROMSTAGE)) /* cbmem_add() does a cbmem_find() first. */ return cbmem_add(CBMEM_ID_VBOOT_WORKBUF, vb_work_buf_size); else @@ -55,7 +55,7 @@ static struct vb2_working_data * const vboot_get_working_data(void) static size_t vb2_working_data_size(void) { - if (IS_ENABLED(CONFIG_VBOOT_DYNAMIC_WORK_BUFFER)) + if (IS_ENABLED(CONFIG_VBOOT_STARTS_IN_ROMSTAGE)) return vb_work_buf_size; else return _vboot2_work_size; @@ -168,12 +168,12 @@ void vb2_store_selected_region(void) } /* - * For platforms that employ VBOOT_DYNAMIC_WORK_BUFFER, the vboot + * For platforms that employ VBOOT_STARTS_IN_ROMSTAGE, the vboot * verification doesn't happen until after cbmem is brought online. * Therefore, the selected region contents would not be initialized * so don't automatically add results when cbmem comes online. */ -#if !IS_ENABLED(CONFIG_VBOOT_DYNAMIC_WORK_BUFFER) +#if !IS_ENABLED(CONFIG_VBOOT_STARTS_IN_ROMSTAGE) static void vb2_store_selected_region_cbmem(int unused) { vb2_store_selected_region(); |