mb/lenovo: Unify thermal threshold handling

Unify thermal handling across Lenovo boards (except g505, which is
different). Namely, do the following:

* Move thermal levels from acpi_tables to thermal.h (and create if
  necessary).
* Don't use board-specific ifdef guards.
* Set thermal levels using dedicated acpi_update_thermal_table function
  as almost all Lenovo boards do.
* Update list of authors in comments. Merge all author's entries.
* Minor whitespace and formatting.

This makes diff -ruw between the Lenovo boards smaller.

Change-Id: If569f67c932b7fbf14893b890a5588df4994daeb
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/29659
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

28 files changed, 402 insertions, 115 deletions

diff --git a/src/mainboard/lenovo/l520/acpi_tables.c b/src/mainboard/lenovo/l520/acpi_tables.c
index b86186404c..31f41e7561 100644
--- a/src/mainboard/lenovo/l520/acpi_tables.c
+++ b/src/mainboard/lenovo/l520/acpi_tables.c
@@ -35,7 +35,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->s5u0 = 0;
 	gnvs->s5u1 = 0;
 
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/lenovo/l520/thermal.h b/src/mainboard/lenovo/l520/thermal.h
index a2007ffeda..72953fd2c2 100644
--- a/src/mainboard/lenovo/l520/thermal.h
+++ b/src/mainboard/lenovo/l520/thermal.h
@@ -2,7 +2,10 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
  * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -15,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef L520_THERMAL_H
-#define L520_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif /* L520_THERMAL_H */
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/s230u/acpi_tables.c b/src/mainboard/lenovo/s230u/acpi_tables.c
index 21fce85f5a..8d6d93f1c3 100644
--- a/src/mainboard/lenovo/s230u/acpi_tables.c
+++ b/src/mainboard/lenovo/s230u/acpi_tables.c
@@ -14,6 +14,13 @@
  */
 
 #include <southbridge/intel/bd82x6x/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -28,6 +35,5 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	/* The LID is open by default */
 	gnvs->lids = 1;
 
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
diff --git a/src/mainboard/lenovo/s230u/thermal.h b/src/mainboard/lenovo/s230u/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/s230u/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 301ca50735..8fb9056c51 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -21,6 +21,13 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <southbridge/intel/i82801ix/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -32,9 +39,7 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	/* Set thermal levels */
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/t400/thermal.h b/src/mainboard/lenovo/t400/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/t400/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t420/thermal.h b/src/mainboard/lenovo/t420/thermal.h
index 6ca5b2a672..72953fd2c2 100644
--- a/src/mainboard/lenovo/t420/thermal.h
+++ b/src/mainboard/lenovo/t420/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef T420_THERMAL_H
-#define T420_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
 /* Temperature which OS will shutdown at */
 #define CRITICAL_TEMPERATURE	100
@@ -23,4 +27,4 @@
 /* Temperature which OS will throttle CPU */
 #define PASSIVE_TEMPERATURE	90
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t420s/thermal.h b/src/mainboard/lenovo/t420s/thermal.h
index c7803e5c7a..72953fd2c2 100644
--- a/src/mainboard/lenovo/t420s/thermal.h
+++ b/src/mainboard/lenovo/t420s/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef T420S_THERMAL_H
-#define T420S_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t430/thermal.h b/src/mainboard/lenovo/t430/thermal.h
index e3e49f594e..edfe3bc7ce 100644
--- a/src/mainboard/lenovo/t430/thermal.h
+++ b/src/mainboard/lenovo/t430/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _LENOVO_T430_THERMAL_H
-#define _LENOVO_T430_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
 /* Config TDP Sensor ID */
 #define CTDP_SENSOR_ID			0 /* PECI */
@@ -37,4 +41,4 @@
 /* Tj_max value for calculating PECI CPU temperature */
 #define MAX_TEMPERATURE			105
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t430s/thermal.h b/src/mainboard/lenovo/t430s/thermal.h
index 1d55584ce9..72953fd2c2 100644
--- a/src/mainboard/lenovo/t430s/thermal.h
+++ b/src/mainboard/lenovo/t430s/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef T430S_THERMAL_H
-#define T430S_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
 /* Temperature which OS will shutdown at */
 #define CRITICAL_TEMPERATURE	100
@@ -23,4 +27,4 @@
 /* Temperature which OS will throttle CPU */
 #define PASSIVE_TEMPERATURE	90
 
-#endif /* T430S_THERMAL_H */
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c
index a3b0894bcc..279674d002 100644
--- a/src/mainboard/lenovo/t520/acpi_tables.c
+++ b/src/mainboard/lenovo/t520/acpi_tables.c
@@ -32,7 +32,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->s5u0 = 0;
 	gnvs->s5u1 = 0;
 
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/lenovo/t520/thermal.h b/src/mainboard/lenovo/t520/thermal.h
index 60721bf244..72953fd2c2 100644
--- a/src/mainboard/lenovo/t520/thermal.h
+++ b/src/mainboard/lenovo/t520/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef T520_THERMAL_H
-#define T520_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif /* T520_THERMAL_H */
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c
index a3b0894bcc..279674d002 100644
--- a/src/mainboard/lenovo/t530/acpi_tables.c
+++ b/src/mainboard/lenovo/t530/acpi_tables.c
@@ -32,7 +32,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->s5u0 = 0;
 	gnvs->s5u1 = 0;
 
-
 	// the lid is open by default.
 	gnvs->lids = 1;
 
diff --git a/src/mainboard/lenovo/t530/thermal.h b/src/mainboard/lenovo/t530/thermal.h
index 0b24ea8186..72953fd2c2 100644
--- a/src/mainboard/lenovo/t530/thermal.h
+++ b/src/mainboard/lenovo/t530/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef T530_THERMAL_H
-#define T530_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif /* T530_THERMAL_H */
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
index 183b7fe299..bd10a0e3fb 100644
--- a/src/mainboard/lenovo/t60/acpi_tables.c
+++ b/src/mainboard/lenovo/t60/acpi_tables.c
@@ -16,6 +16,13 @@
 
 #include <stdint.h>
 #include <southbridge/intel/i82801gx/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -23,7 +30,5 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	/* Set thermal levels */
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
diff --git a/src/mainboard/lenovo/t60/thermal.h b/src/mainboard/lenovo/t60/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/t60/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x131e/thermal.h b/src/mainboard/lenovo/x131e/thermal.h
index ff928699ae..72953fd2c2 100644
--- a/src/mainboard/lenovo/x131e/thermal.h
+++ b/src/mainboard/lenovo/x131e/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
  * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,15 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef X131E_THERMAL_H
-#define X131E_THERMAL_H
-
-/* Active Thermal and fans are controlled by the EC. */
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
 /* Temperature which OS will shutdown at */
-#define CRITICAL_TEMPERATURE    100
+#define CRITICAL_TEMPERATURE	100
 
 /* Temperature which OS will throttle CPU */
-#define PASSIVE_TEMPERATURE     90
+#define PASSIVE_TEMPERATURE	90
 
-#endif /* X131E_THERMAL_H */
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/thermal.h b/src/mainboard/lenovo/x1_carbon_gen1/thermal.h
index 199c27e637..72953fd2c2 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/thermal.h
+++ b/src/mainboard/lenovo/x1_carbon_gen1/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef X230_THERMAL_H
-#define X230_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 301ca50735..8fb9056c51 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -21,6 +21,13 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <southbridge/intel/i82801ix/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -32,9 +39,7 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	/* Set thermal levels */
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/x200/thermal.h b/src/mainboard/lenovo/x200/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/x200/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index e412503c88..82991b267b 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -17,10 +17,15 @@
 
 #include <stdint.h>
 #include <southbridge/intel/ibexpeak/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t * gnvs)
 {
-	/* Set thermal levels */
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
diff --git a/src/mainboard/lenovo/x201/thermal.h b/src/mainboard/lenovo/x201/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/x201/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x220/thermal.h b/src/mainboard/lenovo/x220/thermal.h
index 82df303093..72953fd2c2 100644
--- a/src/mainboard/lenovo/x220/thermal.h
+++ b/src/mainboard/lenovo/x220/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef X220_THERMAL_H
-#define X220_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x230/thermal.h b/src/mainboard/lenovo/x230/thermal.h
index 199c27e637..72953fd2c2 100644
--- a/src/mainboard/lenovo/x230/thermal.h
+++ b/src/mainboard/lenovo/x230/thermal.h
@@ -1,12 +1,16 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2008-2009 coresystems GmbH
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,13 +18,13 @@
  * GNU General Public License for more details.
  */
 
-#ifndef X230_THERMAL_H
-#define X230_THERMAL_H
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
 
-	/* Temperature which OS will shutdown at */
-	#define CRITICAL_TEMPERATURE	100
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
 
-	/* Temperature which OS will throttle CPU */
-	#define PASSIVE_TEMPERATURE	90
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
 
-#endif
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index 183b7fe299..bd10a0e3fb 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -16,6 +16,13 @@
 
 #include <stdint.h>
 #include <southbridge/intel/i82801gx/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -23,7 +30,5 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	/* Set thermal levels */
-	gnvs->tcrt = 100;
-	gnvs->tpsv = 90;
+	acpi_update_thermal_table(gnvs);
 }
diff --git a/src/mainboard/lenovo/x60/thermal.h b/src/mainboard/lenovo/x60/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/x60/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */
diff --git a/src/mainboard/lenovo/z61t/acpi_tables.c b/src/mainboard/lenovo/z61t/acpi_tables.c
index 3e9a81042e..bd10a0e3fb 100644
--- a/src/mainboard/lenovo/z61t/acpi_tables.c
+++ b/src/mainboard/lenovo/z61t/acpi_tables.c
@@ -16,6 +16,13 @@
 
 #include <stdint.h>
 #include <southbridge/intel/i82801gx/nvs.h>
+#include "thermal.h"
+
+static void acpi_update_thermal_table(global_nvs_t *gnvs)
+{
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+}
 
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -23,4 +30,5 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
+	acpi_update_thermal_table(gnvs);
 }
diff --git a/src/mainboard/lenovo/z61t/thermal.h b/src/mainboard/lenovo/z61t/thermal.h
new file mode 100644
index 0000000000..72953fd2c2
--- /dev/null
+++ b/src/mainboard/lenovo/z61t/thermal.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2008-2009 coresystems GmbH
+ * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
+ * Copyright (C) 2014 Vladimir Serbinenko
+ * Copyright (C) 2016 Patrick Rudolph  <siro@das-labor.org>
+ * Copyright (C) 2017 James Ye <jye836@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef MAINBOARD_THERMAL_H
+#define MAINBOARD_THERMAL_H
+
+/* Temperature which OS will shutdown at */
+#define CRITICAL_TEMPERATURE	100
+
+/* Temperature which OS will throttle CPU */
+#define PASSIVE_TEMPERATURE	90
+
+#endif /* MAINBOARD_THERMAL_H */