ARM: fmap: Align the GBB on a 4K boundary.

A comment in the fmap said that the GBB should be aligned on a 4K boundary,
but the actual layout of the image had it at an offset. This caused some GBB
related utilities like (used during FAFT tests) to misbehave
and wipe out other parts of the image, specifically the read only firmware id.

This change fixes things by switching the RO firmware id and the GBB while
keeping everything the same size and all the other sections in place. The
GBB's size isn't a multiple of 4K which is assumed to be ok.

TEST=Built and booted on pit with this change. Ran
/usr/share/vboot/bin/ and verified that the RO firmware ID was
still intact by rebooting and running crossystem. Before this change the RO
firmware ID would be replaced with all zeroes.

Change-Id: Icb6db326b54fce167ef83ae12e127669c9af1305
Signed-off-by: Gabe Black <>
Reviewed-by: Stefan Reinauer <>
Reviewed-by: Randall Spangler <>
Commit-Queue: Gabe Black <>
Tested-by: Gabe Black <>
3 files changed
tree: 34bce1df8f8c27f160c270e6c21e5e072f352a87
  1. .gitignore
  2. Kconfig
  3. Makefile
  5. PRESUBMIT.cfg
  6. board/
  7. src/
  8. util/