HAOUAS Elyes has uploaded this change for review. ( 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 ehaouas@noos.fr --- M src/arch/x86/smbios.c 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/31437/1
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index f816647..345e737 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_version; + t->system_bios_minor_release = coreboot_extra_version; + t->bios_characteristics = BIOS_CHARACTERISTICS_PCI_SUPPORTED | BIOS_CHARACTERISTICS_SELECTABLE_BOOT |
Hello Patrick Rudolph, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31437
to look at the new patch set (#2).
Change subject: SMBIOS: Fix bios version ......................................................................
SMBIOS: Fix bios version
Change-Id: I142f08ed3c2704b8fde6d176f23772f5d6b33e85 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/arch/x86/smbios.c 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/31437/2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31437 )
Change subject: SMBIOS: Fix bios version ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/31437/2/src/arch/x86/smbios.c File src/arch/x86/smbios.c:
https://review.coreboot.org/#/c/31437/2/src/arch/x86/smbios.c@386 PS2, Line 386: t->system_bios_minor_release = COREBOOT_EXTRA_VERSION; These macros are strings...
Hello Patrick Rudolph, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31437
to look at the new patch set (#3).
Change subject: SMBIOS: Fix bios version ......................................................................
SMBIOS: Fix bios version
Change-Id: I142f08ed3c2704b8fde6d176f23772f5d6b33e85 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- 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(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/31437/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31437 )
Change subject: SMBIOS: Fix bios version ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/31437/3/util/genbuild_h/genbuild_h.sh File util/genbuild_h/genbuild_h.sh:
https://review.coreboot.org/#/c/31437/3/util/genbuild_h/genbuild_h.sh@61 PS3, Line 61: 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/'` line over 80 characters
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31437 )
Change subject: SMBIOS: Fix bios version ......................................................................
Patch Set 3: Code-Review+2
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 ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/31437 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- 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"