diff options
Diffstat (limited to 'src/mainboard/intel/kblrvp/romstage.c')
-rw-r--r-- | src/mainboard/intel/kblrvp/romstage.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/mainboard/intel/kblrvp/romstage.c b/src/mainboard/intel/kblrvp/romstage.c index bc39a806da..2e0292daf7 100644 --- a/src/mainboard/intel/kblrvp/romstage.c +++ b/src/mainboard/intel/kblrvp/romstage.c @@ -31,7 +31,6 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) { FSP_M_CONFIG *mem_cfg; mem_cfg = &mupd->FspmConfig; - struct region_device spd_rdev; u8 spd_index = (get_board_id() >> 5) & 0x7; printk(BIOS_INFO, "SPD index %d\n", spd_index); @@ -41,15 +40,22 @@ void mainboard_memory_init_params(FSPM_UPD *mupd) mainboard_fill_rcomp_res_data(&mem_cfg->RcompResistor); mainboard_fill_rcomp_strength_data(&mem_cfg->RcompTarget); - /* RVP3 SPD */ - mem_cfg->DqPinsInterleaved = 0; - - if (get_spd_cbfs_rdev(&spd_rdev, spd_index) < 0) { - die("spd.bin not found\n"); + if (IS_ENABLED(CONFIG_BOARD_INTEL_KBLRVP3)) { + struct region_device spd_rdev; + + mem_cfg->DqPinsInterleaved = 0; + if (get_spd_cbfs_rdev(&spd_rdev, spd_index) < 0) + die("spd.bin not found\n"); + mem_cfg->MemorySpdDataLen = region_device_sz(&spd_rdev); + /* Memory leak is ok since we have memory mapped boot media */ + mem_cfg->MemorySpdPtr00 = (uintptr_t)rdev_mmap_full(&spd_rdev); + } else { /* for CONFIG_BOARD_INTEL_KBLRVP7 */ + struct spd_block blk; + + mem_cfg->DqPinsInterleaved = 1; + get_spd_smbus(&blk); + mem_cfg->MemorySpdDataLen = blk.len; + mem_cfg->MemorySpdPtr00 = (u32)blk.spd_array[0]; } - - mem_cfg->MemorySpdDataLen = region_device_sz(&spd_rdev); - /* Memory leak is ok since we have memory mapped boot media */ - mem_cfg->MemorySpdPtr00 = (uintptr_t)rdev_mmap_full(&spd_rdev); mem_cfg->MemorySpdPtr10 = mem_cfg->MemorySpdPtr00; } |