diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-18 12:41:16 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-20 07:28:37 +0100 |
| commit | c36af7b00a9854f626894e51fd28c9df6f1e4e43 (patch) | |
| tree | 90432ea5c8140d8882eecd5c63bedb1251d8da2b /src/mainboard/lenovo/x60 | |
| parent | 339064a0bfdaffb82ed407772b86826e98f77103 (diff) | |
| download | coreboot-c36af7b00a9854f626894e51fd28c9df6f1e4e43.tar.xz | |
Replace includes of build.h with version.h
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 <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7510
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/lenovo/x60')
| -rw-r--r-- | src/mainboard/lenovo/x60/mainboard.c | 11 |
1 files changed, 8 insertions, 3 deletions
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) |