From dafe1bf032c81e1eeec374905a39b377b05dddbf Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Thu, 27 Apr 2017 16:29:02 -0700
Subject: [PATCH] UPSTREAM: vboot: Separate board name and version number in
 FWID with a dot

It's standard practice in vboot that the FWID consists of
<board_name>.<version_number> (e.g. Google_Kevin.8785.57.0). In fact,
some tools rely on this and cut the string at the first dot to
separate the two.

The current Kconfig default in coreboot instead leads to ugly,
parser-breaking FWIDs like Google_Kevin4.5-1234-5678abcd. This patch
fixes that.

BUG=none
BRANCH=none
TEST=none

Change-Id: Ibbe8a40ccbcba8e4d448eb618b6291d43969a6b1
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 46f292f9bf508b48f5e74f713884b2424e199f42
Original-Change-Id: I65cd5285c69e2e485d55a41a65d735f6a2291c16
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/19487
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/493970
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
---
 src/vboot/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vboot/Kconfig b/src/vboot/Kconfig
index 4ddf3e3534..c4b4687585 100644
--- a/src/vboot/Kconfig
+++ b/src/vboot/Kconfig
@@ -206,7 +206,7 @@ config VBOOT_FWID_MODEL
 
 config VBOOT_FWID_VERSION
 	string "Firmware ID version"
-	default "$(KERNELVERSION)"
+	default ".$(KERNELVERSION)"
 	help
 	  This is the second part of the FWID written to various regions of a
 	  vboot firmware image to identify its version.