summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-03-12 20:48:53 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-03-23 10:59:26 +0000
commitc4ee714881c7f7bb7a9208b39c76d98578c434b1 (patch)
treebbf6051210754cd954b792163d2331eb0bf309bc /src/mainboard
parentd99b693c965abb13aa57c5701bfd08547fa93cb5 (diff)
nb/intel/haswell: Use unshifted SPD addresses in mainboards
It's common to use the raw, unshifted I2C address in coreboot. Adapt mainboards accordingly and perform the shift in MRC glue code. Tested on Asrock B85M Pro4, still boots and still resumes from S3. Change-Id: I4e4978772744ea27f4c5a88def60a8ded66520e1 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51458 Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/asrock/b85m_pro4/romstage.c8
-rw-r--r--src/mainboard/asrock/h81m-hds/romstage.c4
-rw-r--r--src/mainboard/google/beltino/romstage.c4
-rw-r--r--src/mainboard/hp/folio_9480m/romstage.c4
-rw-r--r--src/mainboard/intel/baskingridge/romstage.c8
-rw-r--r--src/mainboard/lenovo/t440p/romstage.c4
-rw-r--r--src/mainboard/msi/h81m-p33/romstage.c4
-rw-r--r--src/mainboard/supermicro/x10slm-f/romstage.c8
8 files changed, 22 insertions, 22 deletions
diff --git a/src/mainboard/asrock/b85m_pro4/romstage.c b/src/mainboard/asrock/b85m_pro4/romstage.c
index 7a4e402d91..793a7d7b30 100644
--- a/src/mainboard/asrock/b85m_pro4/romstage.c
+++ b/src/mainboard/asrock/b85m_pro4/romstage.c
@@ -19,10 +19,10 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[1] = 0xa2;
- spdi->addresses[2] = 0xa4;
- spdi->addresses[3] = 0xa6;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[1] = 0x51;
+ spdi->addresses[2] = 0x52;
+ spdi->addresses[3] = 0x53;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/asrock/h81m-hds/romstage.c b/src/mainboard/asrock/h81m-hds/romstage.c
index 58f9697162..a5b667f053 100644
--- a/src/mainboard/asrock/h81m-hds/romstage.c
+++ b/src/mainboard/asrock/h81m-hds/romstage.c
@@ -19,8 +19,8 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[2] = 0xa4;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[2] = 0x52;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/google/beltino/romstage.c b/src/mainboard/google/beltino/romstage.c
index b69fb933b3..9904d5a9b9 100644
--- a/src/mainboard/google/beltino/romstage.c
+++ b/src/mainboard/google/beltino/romstage.c
@@ -42,8 +42,8 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[2] = 0xa4;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[2] = 0x52;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/hp/folio_9480m/romstage.c b/src/mainboard/hp/folio_9480m/romstage.c
index af3005f04c..865fcc6617 100644
--- a/src/mainboard/hp/folio_9480m/romstage.c
+++ b/src/mainboard/hp/folio_9480m/romstage.c
@@ -19,8 +19,8 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[2] = 0xa4;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[2] = 0x52;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/intel/baskingridge/romstage.c b/src/mainboard/intel/baskingridge/romstage.c
index 7580799898..0f2719a106 100644
--- a/src/mainboard/intel/baskingridge/romstage.c
+++ b/src/mainboard/intel/baskingridge/romstage.c
@@ -43,10 +43,10 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[1] = 0xa2;
- spdi->addresses[2] = 0xa4;
- spdi->addresses[3] = 0xa6;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[1] = 0x51;
+ spdi->addresses[2] = 0x52;
+ spdi->addresses[3] = 0x53;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/lenovo/t440p/romstage.c b/src/mainboard/lenovo/t440p/romstage.c
index 7840a1fffa..a85935b678 100644
--- a/src/mainboard/lenovo/t440p/romstage.c
+++ b/src/mainboard/lenovo/t440p/romstage.c
@@ -42,8 +42,8 @@ void mb_late_romstage_setup(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[2] = 0xa2;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[2] = 0x51;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/msi/h81m-p33/romstage.c b/src/mainboard/msi/h81m-p33/romstage.c
index 059ebdc1b6..97c888d9e7 100644
--- a/src/mainboard/msi/h81m-p33/romstage.c
+++ b/src/mainboard/msi/h81m-p33/romstage.c
@@ -19,8 +19,8 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[2] = 0xa4;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[2] = 0x52;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {
diff --git a/src/mainboard/supermicro/x10slm-f/romstage.c b/src/mainboard/supermicro/x10slm-f/romstage.c
index 2ec993ffb3..e555bea29b 100644
--- a/src/mainboard/supermicro/x10slm-f/romstage.c
+++ b/src/mainboard/supermicro/x10slm-f/romstage.c
@@ -19,10 +19,10 @@ void mainboard_config_rcba(void)
void mb_get_spd_map(struct spd_info *spdi)
{
- spdi->addresses[0] = 0xa0;
- spdi->addresses[1] = 0xa2;
- spdi->addresses[2] = 0xa4;
- spdi->addresses[3] = 0xa6;
+ spdi->addresses[0] = 0x50;
+ spdi->addresses[1] = 0x51;
+ spdi->addresses[2] = 0x52;
+ spdi->addresses[3] = 0x53;
}
const struct usb2_port_setting mainboard_usb2_ports[MAX_USB2_PORTS] = {