[coreboot-gerrit] Change in ...coreboot[master]: SMBIOS: Fix bios version

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31437 )

Change subject: SMBIOS: Fix bios version
......................................................................

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 
---
M src/arch/x86/smbios.c
M src/include/version.h
M src/lib/version.c
M util/genbuild_h/genbuild_h.sh
4 files changed, 8 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved

diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index f816647..da25694 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -382,7 +382,9 @@
    	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 f24b893..d8cf725 100644
--- a/src/include/version.h
+++ b/src/include/version.h
@@ -10,6 +10,8 @@
 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 63235b3..c84a727 100644
--- a/src/lib/version.c
+++ b/src/lib/version.c
@@ -30,6 +30,8 @@
 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 95846ce..c7b06d9 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -58,6 +58,7 @@
 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"