From c36af7b00a9854f626894e51fd28c9df6f1e4e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 18 Nov 2014 12:41:16 +0200 Subject: Replace includes of build.h with version.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As build.h is an auto-generated file it was necessary to add it as an explicit prerequisite in the Makefiles. When this was forgotten abuild would sometimes fail with following error: fatal error: build.h: No such file or directory Fix this error by compiling version.c into all stages. Change-Id: I342f341077cc7496aed279b00baaa957aa2af0db Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7510 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/mainboard/lenovo/t60/mainboard.c | 11 ++++++++--- src/mainboard/lenovo/x200/mainboard.c | 11 ++++++++--- src/mainboard/lenovo/x201/mainboard.c | 11 ++++++++--- src/mainboard/lenovo/x220/mainboard.c | 11 ++++++++--- src/mainboard/lenovo/x230/mainboard.c | 11 ++++++++--- src/mainboard/lenovo/x60/mainboard.c | 11 ++++++++--- 6 files changed, 48 insertions(+), 18 deletions(-) (limited to 'src/mainboard/lenovo') 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 #include #include -#include +#include #include #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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #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 #include #include -#include +#include 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 #include #include -#include +#include 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 #include -#include +#include #include #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) -- cgit v1.2.3