From 94ad37619f95a07b94a6a9a570bd74727eb830c4 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Fri, 15 Feb 2019 17:39:56 +0100 Subject: [PATCH] SMBIOS: Fix bios version Change-Id: I142f08ed3c2704b8fde6d176f23772f5d6b33e85 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/31437 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/arch/x86/smbios.c | 4 +++- src/include/version.h | 2 ++ src/lib/version.c | 2 ++ util/genbuild_h/genbuild_h.sh | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index f816647ee2..da2569443d 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -382,7 +382,9 @@ static int smbios_write_type0(unsigned long *current, int handle) t->extended_bios_rom_size = DIV_ROUND_UP(CONFIG_ROM_SIZE, MiB); } - t->system_bios_major_release = 4; + t->system_bios_major_release = coreboot_major_revision; + t->system_bios_minor_release = coreboot_minor_revision; + t->bios_characteristics = BIOS_CHARACTERISTICS_PCI_SUPPORTED | BIOS_CHARACTERISTICS_SELECTABLE_BOOT | diff --git a/src/include/version.h b/src/include/version.h index f24b893e0a..d8cf725166 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -10,6 +10,8 @@ extern const char coreboot_version[]; extern const char coreboot_extra_version[]; extern const char coreboot_build[]; extern const unsigned int coreboot_version_timestamp; +extern const unsigned int coreboot_major_revision; +extern const unsigned int coreboot_minor_revision; /* When coreboot was compiled */ extern const char coreboot_compile_time[]; diff --git a/src/lib/version.c b/src/lib/version.c index 63235b3262..c84a7275e6 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -30,6 +30,8 @@ const char coreboot_version[] = COREBOOT_VERSION; const char coreboot_extra_version[] = COREBOOT_EXTRA_VERSION; const char coreboot_build[] = COREBOOT_BUILD; const unsigned int coreboot_version_timestamp = COREBOOT_VERSION_TIMESTAMP; +const unsigned int coreboot_major_revision = COREBOOT_MAJOR_VERSION; +const unsigned int coreboot_minor_revision = COREBOOT_MINOR_VERSION; const char coreboot_compile_time[] = COREBOOT_COMPILE_TIME; const char coreboot_dmi_date[] = COREBOOT_DMI_DATE; diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh index 95846ceae6..c7b06d91df 100755 --- a/util/genbuild_h/genbuild_h.sh +++ b/util/genbuild_h/genbuild_h.sh @@ -58,6 +58,7 @@ printf "#define COREBOOT_VERSION_TIMESTAMP $DATE\n" printf "#define COREBOOT_ORIGIN_GIT_REVISION \"$GITREV\"\n" printf "#define COREBOOT_EXTRA_VERSION \"%s\"\n" "$COREBOOT_EXTRA_VERSION" +printf "#define COREBOOT_MAJOR_VERSION %d\n#define COREBOOT_MINOR_VERSION %d\n" `git describe --match [0-9].[0-9]* | sed 's/\([0-9]\)\.\([0-9]\+\).*/\1 \2/'` printf "#define COREBOOT_BUILD \"$(our_date "$DATE")\"\n" printf "#define COREBOOT_BUILD_YEAR_BCD 0x$(our_date "$DATE" +%y)\n" printf "#define COREBOOT_BUILD_MONTH_BCD 0x$(our_date "$DATE" +%m)\n"