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.

TEST=use with flashrom (e.g., in vpd tests), and pass VPD validity

Change-Id: I3e5ae95bf506a1ef52dad16ad5a2ef64405b2922
Tested-by: Brian Norris <>
Reviewed-by: Jack Rosenthal <>
Commit-Queue: Brian Norris <>
1 file changed