sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace some ENV_ROMSTAGE with ENV_RAMINIT

Browse Source 
With a combined bootblock+romstage ENV_ROMSTAGE might no
longer evaluate true.

Change-Id: I733cf4e4ab177e35cd260318556ece1e73d082dc
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63376
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
This commit is contained in:
Kyösti Mälkki
2022-04-07 07:16:48 +03:00
committed by Felix Held
parent 0310d34c2f
commit 11cac784ff
21 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/drivers/amd/agesa/def_callouts.c
View File

@@ -129,7 +129,7 @@ AGESA_STATUS agesa_GfxGetVbiosImage(UINT32 Func, UINTN FchData, VOID *ConfigPrt)
AGESA_STATUS agesa_ReadSpd (UINT32 Func, UINTN Data, VOID *ConfigPtr)
{
if (!ENV_ROMSTAGE)
if (!ENV_RAMINIT)
return AGESA_UNSUPPORTED;
return AmdMemoryReadSPD (Func, Data, ConfigPtr);
@@ -139,7 +139,7 @@ AGESA_STATUS agesa_ReadSpd_from_cbfs(UINT32 Func, UINTN Data, VOID *ConfigPtr)
{
AGESA_READ_SPD_PARAMS *info = ConfigPtr;
if (!ENV_ROMSTAGE)
if (!ENV_RAMINIT)
return AGESA_UNSUPPORTED;
if (info->MemChannelId > 0)

4
src/drivers/amd/agesa/state_machine.c
View File

@@ -18,7 +18,7 @@
#include "Dispatcher.h"
#endif
#if ENV_ROMSTAGE
#if ENV_RAMINIT
#include <PlatformMemoryConfiguration.h>
CONST PSO_ENTRY ROMDATA DefaultPlatformMemoryConfiguration[] = {PSO_END};
#endif
@@ -262,7 +262,7 @@ int agesa_execute_state(struct sysinfo *cb, AGESA_STRUCT_NAME func)
if (CONFIG(AGESA_EXTRA_TIMESTAMPS) && task.ts_entry_id)
timestamp_add_now(task.ts_entry_id);
if (ENV_ROMSTAGE)
if (ENV_RAMINIT)
final = romstage_dispatch(cb, func, StdHeader);
if (ENV_RAMSTAGE)

2
src/drivers/intel/fsp2_0/hand_off_block.c
View File

@@ -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;

4
src/drivers/intel/fsp2_0/util.c
View File

@@ -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;
}