bundle_firmware: change default FWID to Model.Version
The firmware image should describe itself in a more meaningful way, instead of
only the version string. Adding "model name" is a good choice, which would work
more like x86 naming style.
BUG=none, development request
TEST=emerge-tegra2_dev-board chromeos-bootimage
dump_fmap -x /build/tegra2_dev-board/u-boot/image.bin
cat RO_FRID # seeing Xxxxx_Seaboard.0.14.XXXX
Change-Id: I6c0502c48332b8706dcccd8e18a43b9ba5d93c37
Reviewed-on: http://gerrit.chromium.org/gerrit/4809
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index abb3a63..ced4d40 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -323,7 +323,9 @@
if gbb:
pack = PackFirmware(self._tools, self._out)
image = os.path.join(self._tools.outdir, 'image.bin')
- fwid = self._tools.GetChromeosVersion()
+ fwid = '.'.join([
+ re.sub('[ ,]+', '_', fdt.GetString('/model')),
+ self._tools.GetChromeosVersion()])
self._out.Notice('Firmware ID: %s' % fwid)
pack.SetupFiles(boot=bootstub, signed=signed, gbb=gbb,
fwid=fwid, keydir=self._keydir)