summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/prodrive/hermes/eeprom.c11
-rw-r--r--src/mainboard/prodrive/hermes/ramstage.c4
-rw-r--r--src/mainboard/prodrive/hermes/romstage.c4
-rw-r--r--src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h7
4 files changed, 12 insertions, 14 deletions
diff --git a/src/mainboard/prodrive/hermes/eeprom.c b/src/mainboard/prodrive/hermes/eeprom.c
index cece32cf55..d7ecdeca48 100644
--- a/src/mainboard/prodrive/hermes/eeprom.c
+++ b/src/mainboard/prodrive/hermes/eeprom.c
@@ -6,15 +6,17 @@
#include <soc/intel/common/block/smbus/smbuslib.h>
#include "variants/baseboard/include/eeprom.h"
+#define I2C_ADDR_EEPROM 0x57
+
/*
* Check Signature in EEPROM (M24C32-FMN6TP)
* If signature is there we assume that that the content is valid
*/
-int check_signature(u8 addr, const size_t offset, const uint64_t signature)
+int check_signature(const size_t offset, const uint64_t signature)
{
u8 blob[8] = {0};
- if (!read_write_config(addr, blob, offset, 0, ARRAY_SIZE(blob))) {
+ if (!read_write_config(blob, offset, 0, ARRAY_SIZE(blob))) {
/* Check signature */
if (*(uint64_t *)blob == signature) {
printk(BIOS_DEBUG, "CFG EEPROM: Signature valid.\n");
@@ -27,8 +29,7 @@ int check_signature(u8 addr, const size_t offset, const uint64_t signature)
}
/* Read data from offset and write it to offset in UPD */
-bool read_write_config(u8 addr, void *blob, size_t read_offset, size_t write_offset,
- size_t size)
+bool read_write_config(void *blob, size_t read_offset, size_t write_offset, size_t size)
{
int ret = 0;
@@ -42,7 +43,7 @@ bool read_write_config(u8 addr, void *blob, size_t read_offset, size_t write_off
for (size_t i = 0; i < size; i = i + 2) {
u8 tmp[2] = {0};
- ret = do_smbus_process_call(SMBUS_IO_BASE, addr, 0,
+ ret = do_smbus_process_call(SMBUS_IO_BASE, I2C_ADDR_EEPROM, 0,
swab16(read_offset + i), (uint16_t *)&tmp[0]);
if (ret < 0)
break;
diff --git a/src/mainboard/prodrive/hermes/ramstage.c b/src/mainboard/prodrive/hermes/ramstage.c
index 72ae014409..b879be7795 100644
--- a/src/mainboard/prodrive/hermes/ramstage.c
+++ b/src/mainboard/prodrive/hermes/ramstage.c
@@ -19,13 +19,13 @@ void mainboard_silicon_init_params(FSPS_UPD *supd)
params->SataLedEnable = 1;
/* Overwrite params */
- if (!check_signature(I2C_ADDR_EEPROM, EEPROM_OFFSET_FSP_SIGNATURE, FSP_UPD_SIGNATURE))
+ if (!check_signature(EEPROM_OFFSET_FSP_SIGNATURE, FSP_UPD_SIGNATURE))
return;
for (u8 i = 0; i <= ARRAY_SIZE(parmas_list); i++) {
if (ARRAY_SIZE(parmas_list) == 0)
break;
- read_write_config(I2C_ADDR_EEPROM, params, EEPROM_OFFSET_FSP_CONFIG +
+ read_write_config(params, EEPROM_OFFSET_FSP_CONFIG +
parmas_list[i].offset,
EEPROM_OFFSET_FSP_CONFIG + parmas_list[i].offset,
parmas_list[i].size);
diff --git a/src/mainboard/prodrive/hermes/romstage.c b/src/mainboard/prodrive/hermes/romstage.c
index 6e88413f84..0ba9f451fd 100644
--- a/src/mainboard/prodrive/hermes/romstage.c
+++ b/src/mainboard/prodrive/hermes/romstage.c
@@ -19,11 +19,11 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
cannonlake_memcfg_init(&memupd->FspmConfig, variant_memcfg_config());
/* Overwrite memupd */
- if (!check_signature(I2C_ADDR_EEPROM, EEPROM_OFFSET_FSP_SIGNATURE, FSP_UPD_SIGNATURE))
+ if (!check_signature(EEPROM_OFFSET_FSP_SIGNATURE, FSP_UPD_SIGNATURE))
return;
for (size_t i = 0; i < ARRAY_SIZE(parmas_list); i++) {
- read_write_config(I2C_ADDR_EEPROM, memupd, EEPROM_OFFSET_FSP_CONFIG +
+ read_write_config(memupd, EEPROM_OFFSET_FSP_CONFIG +
parmas_list[i].offset,
EEPROM_OFFSET_FSP_CONFIG + parmas_list[i].offset,
parmas_list[i].size);
diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h
index bdfce8a278..95024b6ccd 100644
--- a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h
+++ b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h
@@ -2,8 +2,6 @@
#include <soc/ramstage.h>
-#define I2C_ADDR_EEPROM 0x57
-
#if ENV_ROMSTAGE
#define FSP_UPD_SIGNATURE FSPM_UPD_SIGNATURE
#define EEPROM_OFFSET_FSP_SIGNATURE 0
@@ -25,6 +23,5 @@ typedef struct {
size_t size;
} fsp_params;
-bool read_write_config(u8 addr, void *blob, size_t read_offset, size_t write_offset,
- size_t size);
-int check_signature(u8 addr, const size_t offset, const uint64_t signature);
+bool read_write_config(void *blob, size_t read_offset, size_t write_offset, size_t size);
+int check_signature(const size_t offset, const uint64_t signature);