6 files changed, 48 insertions, 18 deletions
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 79b3da8747..abda9eabc4 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -36,7 +36,7 @@
 #include <arch/x86/include/arch/acpigen.h>
 #include <arch/interrupt.h>
 #include <smbios.h>
-#include <build.h>
+#include <version.h>
 #include <drivers/intel/gma/int15.h>
 #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT
 
@@ -54,11 +54,16 @@ int get_cst_entries(acpi_cstate_t **entries)
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 static void mainboard_init(device_t dev)
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index 8bfd66b319..5354834e3e 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -27,7 +27,7 @@
 #include <ec/acpi/ec.h>
 #include <smbios.h>
 #include <string.h>
-#include <build.h>
+#include <version.h>
 #include <ec/lenovo/pmh7/pmh7.h>
 #include <ec/acpi/ec.h>
 #include <ec/lenovo/h8/h8.h>
@@ -37,11 +37,16 @@
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 static void mainboard_init(device_t dev)
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index a58d41505c..3cda4fa6c6 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -45,7 +45,7 @@
 #include <cpu/x86/lapic.h>
 #include <device/pci.h>
 #include <smbios.h>
-#include <build.h>
+#include <version.h>
 #include "drivers/lenovo/lenovo.h"
 
 static acpi_cstate_t cst_entries[] = {
@@ -62,11 +62,16 @@ int get_cst_entries(acpi_cstate_t ** entries)
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 
diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c
index 2fdc204e4e..87c6c90743 100644
--- a/src/mainboard/lenovo/x220/mainboard.c
+++ b/src/mainboard/lenovo/x220/mainboard.c
@@ -32,7 +32,7 @@
 #include <device/pci.h>
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
-#include <build.h>
+#include <version.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -42,11 +42,16 @@ void mainboard_suspend_resume(void)
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 static void mainboard_init(device_t dev)
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index da0aa65a0a..2a45808eed 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -33,7 +33,7 @@
 #include <device/pci.h>
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
-#include <build.h>
+#include <version.h>
 
 void mainboard_suspend_resume(void)
 {
@@ -43,11 +43,16 @@ void mainboard_suspend_resume(void)
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 static void mainboard_init(device_t dev)
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index 1d29c71220..334c27d64e 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -38,7 +38,7 @@
 #include "dock.h"
 #include <arch/x86/include/arch/acpigen.h>
 #include <smbios.h>
-#include <build.h>
+#include <version.h>
 #include <drivers/intel/gma/int15.h>
 #include "drivers/lenovo/lenovo.h"
 
@@ -103,11 +103,16 @@ static void mainboard_init(device_t dev)
 
 const char *smbios_mainboard_bios_version(void)
 {
+	static char *s = NULL;
+
 	/* Satisfy thinkpad_acpi.  */
 	if (strlen(CONFIG_LOCALVERSION))
 		return "CBET4000 " CONFIG_LOCALVERSION;
-	else
-		return "CBET4000 " COREBOOT_VERSION;
+
+	if (s != NULL)
+		return s;
+	s = strconcat("CBET4000 ", coreboot_version);
+	return s;
 }
 
 static void fill_ssdt(void)