Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48805 )
Change subject: mb/prodrive/hermes: Use already-defined SMBus macros ......................................................................
mb/prodrive/hermes: Use already-defined SMBus macros
Drop chipset register definitions in mainboard code in favor of existing definitions in a header. These definitions are not mainboard-specific.
Tested with BUILD_TIMELESS=1, Prodrive Hermes remains identical.
Change-Id: I29d6f35ec27bff43cf52ae697e905b6a7b48a8d1 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/prodrive/hermes/eeprom.c M src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h 2 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/48805/1
diff --git a/src/mainboard/prodrive/hermes/eeprom.c b/src/mainboard/prodrive/hermes/eeprom.c index 25fde34..cece32c 100644 --- a/src/mainboard/prodrive/hermes/eeprom.c +++ b/src/mainboard/prodrive/hermes/eeprom.c @@ -3,6 +3,7 @@ #include <device/pci_ops.h> #include <console/console.h> #include <device/smbus_host.h> +#include <soc/intel/common/block/smbus/smbuslib.h> #include "variants/baseboard/include/eeprom.h"
/* @@ -32,7 +33,7 @@ int ret = 0;
u32 smb_ctrl_reg = pci_read_config32(PCH_DEV_SMBUS, HOSTC); - pci_write_config32(PCH_DEV_SMBUS, HOSTC, smb_ctrl_reg | HOSTC_I2C_EN); + pci_write_config32(PCH_DEV_SMBUS, HOSTC, smb_ctrl_reg | I2C_EN);
printk(BIOS_SPEW, "%s\tOffset: %04zx\tSize: %02zx\n", __func__, read_offset, size); diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h index 85edbcf..bdfce8a 100644 --- a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h +++ b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h @@ -2,9 +2,6 @@
#include <soc/ramstage.h>
-#define HOSTC 0x40 -#define SMBUS_IO_BASE 0xefa0 -#define HOSTC_I2C_EN (1 << 2) #define I2C_ADDR_EEPROM 0x57
#if ENV_ROMSTAGE
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48805 )
Change subject: mb/prodrive/hermes: Use already-defined SMBus macros ......................................................................
Patch Set 1: Code-Review+2
Hung-Te Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48805 )
Change subject: mb/prodrive/hermes: Use already-defined SMBus macros ......................................................................
mb/prodrive/hermes: Use already-defined SMBus macros
Drop chipset register definitions in mainboard code in favor of existing definitions in a header. These definitions are not mainboard-specific.
Tested with BUILD_TIMELESS=1, Prodrive Hermes remains identical.
Change-Id: I29d6f35ec27bff43cf52ae697e905b6a7b48a8d1 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/48805 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph siro@das-labor.org --- M src/mainboard/prodrive/hermes/eeprom.c M src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h 2 files changed, 2 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/src/mainboard/prodrive/hermes/eeprom.c b/src/mainboard/prodrive/hermes/eeprom.c index 25fde34..cece32c 100644 --- a/src/mainboard/prodrive/hermes/eeprom.c +++ b/src/mainboard/prodrive/hermes/eeprom.c @@ -3,6 +3,7 @@ #include <device/pci_ops.h> #include <console/console.h> #include <device/smbus_host.h> +#include <soc/intel/common/block/smbus/smbuslib.h> #include "variants/baseboard/include/eeprom.h"
/* @@ -32,7 +33,7 @@ int ret = 0;
u32 smb_ctrl_reg = pci_read_config32(PCH_DEV_SMBUS, HOSTC); - pci_write_config32(PCH_DEV_SMBUS, HOSTC, smb_ctrl_reg | HOSTC_I2C_EN); + pci_write_config32(PCH_DEV_SMBUS, HOSTC, smb_ctrl_reg | I2C_EN);
printk(BIOS_SPEW, "%s\tOffset: %04zx\tSize: %02zx\n", __func__, read_offset, size); diff --git a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h index 85edbcf..bdfce8a 100644 --- a/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h +++ b/src/mainboard/prodrive/hermes/variants/baseboard/include/eeprom.h @@ -2,9 +2,6 @@
#include <soc/ramstage.h>
-#define HOSTC 0x40 -#define SMBUS_IO_BASE 0xefa0 -#define HOSTC_I2C_EN (1 << 2) #define I2C_ADDR_EEPROM 0x57
#if ENV_ROMSTAGE
-
Angel Pons (Code Review) -
Hung-Te Lin (Code Review)
-
Patrick Rudolph (Code Review)