[coreboot-gerrit] Change in coreboot[master]: security/vboot: Split fwid.region build target

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/27884 )

Change subject: security/vboot: Split fwid.region build target
......................................................................

security/vboot: Split fwid.region build target

Add the ability to specify the fwid version via a file instead of
via config. This makes it so when doing an incremental build all
objects are not invalidated when bumping the fwid.

The coreboot ebuild will create this file to pass the latest version.

BUG=b:112267918
TEST=ran dmidecide -t 0 and verified version was present

Change-Id: I955106efd648a75a1311f24ede46bd238d1517e0
Signed-off-by: Raul E Rangel <rrangel at chromium.org>
Reviewed-on: https://review.coreboot.org/27884
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Julius Werner <jwerner at chromium.org>
---
M src/security/vboot/Makefile.inc
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved



diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index b542425..7d40428 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -223,8 +223,13 @@
 endif
 	mv $@.tmp $@
 
-$(obj)/fwid.region:
-	printf "$(CONFIG_VBOOT_FWID_MODEL)$(CONFIG_VBOOT_FWID_VERSION)\0" > $@
+$(obj)/fwid.version:
+	echo -n "$(CONFIG_VBOOT_FWID_VERSION)" > $@
+
+$(obj)/fwid.region: $(obj)/fwid.version
+	printf "%s%s\0" \
+		"$(CONFIG_VBOOT_FWID_MODEL)" \
+		"$(file < $(obj)/fwid.version)" > $@
 
 build_complete:: $(obj)/gbb.region $(obj)/fwid.region
 	@printf "    WRITE GBB\n"

-- 
To view, visit https://review.coreboot.org/27884
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I955106efd648a75a1311f24ede46bd238d1517e0
Gerrit-Change-Number: 27884
Gerrit-PatchSet: 2
Gerrit-Owner: Raul Rangel <rrangel at chromium.org>
Gerrit-Reviewer: Julius Werner <jwerner at chromium.org>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: Raul Rangel <rrangel at chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180808/9bb01614/attachment.html>