From 6a5232de3c56dc6c37a549f072c6401172a90537 Mon Sep 17 00:00:00 2001 From: Jan Tatje Date: Sat, 4 Jun 2016 19:29:03 +0200 Subject: [PATCH] UPSTREAM: mainboard/lenovo/x220: Clean up code thermal.h still has references to X230 in include guard since it seems to have been copied from that port. Code formatting changes in romstage.c. Change-Id: Id8bd931bed127036e8bb4ab604d9d6145f767e56 signed-off-by: Jan Tatje Original-Reviewed-on: https://review.coreboot.org/15071 Original-Reviewed-by: Nico Huber (cherry-picked from commit b8743080d8b927d10966630c439e0cc354da5af1) Signed-off-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/350962 Commit-Ready: Aaron Durbin Tested-by: Aaron Durbin Reviewed-by: Aaron Durbin --- src/mainboard/lenovo/x220/romstage.c | 6 ++++-- src/mainboard/lenovo/x220/thermal.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c index 27998d90aa..71ed1a8007 100644 --- a/src/mainboard/lenovo/x220/romstage.c +++ b/src/mainboard/lenovo/x220/romstage.c @@ -75,12 +75,14 @@ const struct southbridge_usb_port mainboard_usb_ports[] = { { 1, 1, 6 }, }; -void mainboard_get_spd(spd_raw_data *spd) { +void mainboard_get_spd(spd_raw_data *spd) +{ read_spd (&spd[0], 0x50); read_spd (&spd[2], 0x51); } -void mainboard_early_init(int s3resume) { +void mainboard_early_init(int s3resume) +{ } void mainboard_config_superio(void) diff --git a/src/mainboard/lenovo/x220/thermal.h b/src/mainboard/lenovo/x220/thermal.h index 199c27e637..82df303093 100644 --- a/src/mainboard/lenovo/x220/thermal.h +++ b/src/mainboard/lenovo/x220/thermal.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef X230_THERMAL_H -#define X230_THERMAL_H +#ifndef X220_THERMAL_H +#define X220_THERMAL_H /* Temperature which OS will shutdown at */ #define CRITICAL_TEMPERATURE 100