fmap: Use FMAP_VER_{MAJOR,MINOR} in fmap header

We're accidentally using the program version (from the Makefile), and
not the FMAP structure version (from fmap.h). This causes problems when
tools are doing strict checks on these fields. Particularly, they're
likely to care about a major version mismatch (0 vs 1).

Appease the linter w.r.t. whitespace while I'm at it.

BUG=b:288327526
TEST=use with flashrom (e.g., in vpd tests), and pass VPD validity
     checks

Change-Id: I3e5ae95bf506a1ef52dad16ad5a2ef64405b2922
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashmap/+/5034759
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>
1 file changed