sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace includes of build.h with version.h

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2014-11-18 12:41:16 +02:00
parent 339064a0bf
commit c36af7b00a
31 changed files with 108 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/x86/boot/smbios.c
View File

@@ -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 */