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/arch/x86 | |
| parent | 339064a0bfdaffb82ed407772b86826e98f77103 (diff) | |
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/arch/x86')
| -rw-r--r-- | src/arch/x86/boot/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/arch/x86/boot/smbios.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/arch/x86/boot/Makefile.inc b/src/arch/x86/boot/Makefile.inc index 2c482b33f3..9a68d81488 100644 --- a/src/arch/x86/boot/Makefile.inc +++ b/src/arch/x86/boot/Makefile.inc @@ -19,6 +19,4 @@ ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpigen.c ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S -$(obj)/arch/x86/boot/smbios.ramstage.o: $(obj)/build.h - -endif # CONFIG_ARCH_RAMSTAGE_X86_32
\ No newline at end of file +endif # CONFIG_ARCH_RAMSTAGE_X86_32 diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index 64889f713c..f2f998d7bc 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -23,7 +23,7 @@ #include <string.h> #include <smbios.h> #include <console/console.h> -#include <build.h> +#include <version.h> #include <device/device.h> #include <arch/cpu.h> #include <cpu/x86/name.h> @@ -123,7 +123,7 @@ const char *__attribute__((weak)) smbios_mainboard_bios_version(void) if (strlen(CONFIG_LOCALVERSION)) return CONFIG_LOCALVERSION; else - return COREBOOT_VERSION; + return coreboot_version; } static int smbios_write_type0(unsigned long *current, int handle) @@ -138,13 +138,13 @@ static int smbios_write_type0(unsigned long *current, int handle) t->vendor = smbios_add_string(t->eos, "coreboot"); #if !CONFIG_CHROMEOS - t->bios_release_date = smbios_add_string(t->eos, COREBOOT_DMI_DATE); + t->bios_release_date = smbios_add_string(t->eos, coreboot_dmi_date); t->bios_version = smbios_add_string(t->eos, smbios_mainboard_bios_version()); #else #define SPACES \ " " - t->bios_release_date = smbios_add_string(t->eos, COREBOOT_DMI_DATE); + t->bios_release_date = smbios_add_string(t->eos, coreboot_dmi_date); u32 version_offset = (u32)smbios_string_table_len(t->eos); t->bios_version = smbios_add_string(t->eos, SPACES); /* SMBIOS offsets start at 1 rather than 0 */ |