From 11cac784ff788b4f0495758d7f5992e457ea552c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 7 Apr 2022 07:16:48 +0300 Subject: Replace some ENV_ROMSTAGE with ENV_RAMINIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With a combined bootblock+romstage ENV_ROMSTAGE might no longer evaluate true. Change-Id: I733cf4e4ab177e35cd260318556ece1e73d082dc Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/63376 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) Reviewed-by: Elyes Haouas Reviewed-by: Raul Rangel --- src/drivers/intel/fsp2_0/hand_off_block.c | 2 +- src/drivers/intel/fsp2_0/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/drivers/intel/fsp2_0') diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index e166cf7150..6ea3aa3406 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/src/drivers/intel/fsp2_0/hand_off_block.c @@ -115,7 +115,7 @@ const void *fsp_get_hob_list(void) { uint32_t *list_loc; - if (ENV_ROMSTAGE) + if (ENV_RAMINIT) return fsp_hob_list_ptr; list_loc = cbmem_find(CBMEM_ID_FSP_RUNTIME); return (list_loc) ? (void *)(uintptr_t)(*list_loc) : NULL; diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 2537b383ab..629f331f29 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -77,7 +77,7 @@ enum cb_err fsp_validate_component(struct fsp_header *hdr, void *fsp_file, size_ return CB_ERR; } - if (ENV_ROMSTAGE) + if (ENV_RAMINIT) soc_validate_fspm_header(hdr); return CB_SUCCESS; @@ -118,7 +118,7 @@ void fsp_handle_reset(uint32_t status) static inline bool fspm_env(void) { - if (ENV_ROMSTAGE) + if (ENV_RAMINIT) return true; return false; } -- cgit v1.2.3