skylake: Default to `BOARD_TYPE_DESKTOP` for PCH-H
Set the `UserBd` FSP-M UPD to `BOARD_TYPE_DESKTOP` by default on PCH-H. Remove now-redundant mainboard code to set the `UserBd` UPD. Change-Id: I349abe5d89f562c158ce9baadbca2b2f56695846 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/57261 Reviewed-by: Felix Singer <felixsinger@posteo.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
8f4098bb3d
commit
b4d3a14360
|
@ -33,7 +33,4 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
|
||||||
|
|
||||||
/* use virtual channel 1 for the dmi interface of the PCH */
|
/* use virtual channel 1 for the dmi interface of the PCH */
|
||||||
mupd->FspmTestConfig.DmiVc1 = 1;
|
mupd->FspmTestConfig.DmiVc1 = 1;
|
||||||
|
|
||||||
/* desktop type */
|
|
||||||
mem_cfg->UserBd = BOARD_TYPE_DESKTOP;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,6 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
|
||||||
|
|
||||||
mem_cfg->CaVrefConfig = 2;
|
mem_cfg->CaVrefConfig = 2;
|
||||||
mem_cfg->DqPinsInterleaved = true;
|
mem_cfg->DqPinsInterleaved = true;
|
||||||
mem_cfg->UserBd = BOARD_TYPE_DESKTOP;
|
|
||||||
|
|
||||||
mem_cfg->MemorySpdDataLen = blk.len;
|
mem_cfg->MemorySpdDataLen = blk.len;
|
||||||
mem_cfg->MemorySpdPtr00 = (u32)blk.spd_array[0];
|
mem_cfg->MemorySpdPtr00 = (u32)blk.spd_array[0];
|
||||||
|
|
|
@ -50,7 +50,6 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
|
||||||
case BOARD_ID_KBL_RVP11:
|
case BOARD_ID_KBL_RVP11:
|
||||||
mem_cfg->MemorySpdPtr01 = (uintptr_t)blk.spd_array[1];
|
mem_cfg->MemorySpdPtr01 = (uintptr_t)blk.spd_array[1];
|
||||||
mem_cfg->MemorySpdPtr11 = (uintptr_t)blk.spd_array[3];
|
mem_cfg->MemorySpdPtr11 = (uintptr_t)blk.spd_array[3];
|
||||||
mem_cfg->UserBd = BOARD_TYPE_DESKTOP;
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -82,6 +82,9 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg,
|
||||||
m_cfg->IedSize = CONFIG_IED_REGION_SIZE;
|
m_cfg->IedSize = CONFIG_IED_REGION_SIZE;
|
||||||
m_cfg->ProbelessTrace = 0;
|
m_cfg->ProbelessTrace = 0;
|
||||||
m_cfg->SaGv = config->SaGv;
|
m_cfg->SaGv = config->SaGv;
|
||||||
|
if (CONFIG(SKYLAKE_SOC_PCH_H))
|
||||||
|
m_cfg->UserBd = BOARD_TYPE_DESKTOP;
|
||||||
|
else
|
||||||
m_cfg->UserBd = BOARD_TYPE_ULT_ULX;
|
m_cfg->UserBd = BOARD_TYPE_ULT_ULX;
|
||||||
m_cfg->RMT = config->RMT;
|
m_cfg->RMT = config->RMT;
|
||||||
m_cfg->CmdTriStateDis = config->CmdTriStateDis;
|
m_cfg->CmdTriStateDis = config->CmdTriStateDis;
|
||||||
|
|
Loading…
Reference in New Issue