summaryrefslogtreecommitdiff
path: root/src/mainboard/google/slippy/variants/leon
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/slippy/variants/leon')
-rw-r--r--src/mainboard/google/slippy/variants/leon/romstage.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/src/mainboard/google/slippy/variants/leon/romstage.c b/src/mainboard/google/slippy/variants/leon/romstage.c
index 49961d93df..938590b4f0 100644
--- a/src/mainboard/google/slippy/variants/leon/romstage.c
+++ b/src/mainboard/google/slippy/variants/leon/romstage.c
@@ -1,10 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <string.h>
-#include <cbfs.h>
-#include <console/console.h>
-#include <cpu/intel/haswell/haswell.h>
-#include <northbridge/intel/haswell/haswell.h>
#include <northbridge/intel/haswell/raminit.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/lynxpoint/lp_gpio.h>
@@ -14,25 +10,8 @@
void copy_spd(struct pei_data *peid)
{
const int gpio_vector[] = {13, 9, 47, -1};
- int spd_index = get_gpios(gpio_vector);
- char *spd_file;
- size_t spd_file_len;
- size_t spd_len = sizeof(peid->spd_data[0]);
- printk(BIOS_DEBUG, "SPD index %d\n", spd_index);
- spd_file = cbfs_map("spd.bin", &spd_file_len);
- if (!spd_file)
- die("SPD data not found.");
-
- if (spd_file_len < ((spd_index + 1) * spd_len)) {
- printk(BIOS_ERR, "SPD index override to 0 - old hardware?\n");
- spd_index = 0;
- }
-
- if (spd_file_len < spd_len)
- die("Missing SPD data.");
-
- memcpy(peid->spd_data[0], spd_file + (spd_index * spd_len), spd_len);
+ unsigned int spd_index = fill_spd_for_index(peid->spd_data[0], get_gpios(gpio_vector));
/* Limiting to a single dimm for 2GB configuration
* Identified by bit 3
@@ -40,8 +19,7 @@ void copy_spd(struct pei_data *peid)
if (spd_index & 0x4)
peid->dimm_channel1_disabled = 3;
else
- memcpy(peid->spd_data[1],
- spd_file + (spd_index * spd_len), spd_len);
+ memcpy(peid->spd_data[1], peid->spd_data[0], SPD_LEN);
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {