diff options
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 */ |