Patch merged into coreboot/master: cbfstool: honor larger-than-usual header sizes in cbfs_add_entry_at()

the following patch was just integrated into master:
commit 7fd14184fb7cf2a4a713d47b8028155f77a090fc
Author: Patrick Georgi 
Date:   Tue Aug 11 15:55:16 2015 +0200

cbfstool: honor larger-than-usual header sizes in cbfs_add_entry_at()

If an earlier stage built a larger header, cbfs_add_entry_at() shouldn't
    decide to go with the most boring, least featureful header type (and its size)
    instead.

Change-Id: Icc5dcd9a797a0f3c42f91cddd21b3b3916095b63
    Signed-off-by: Patrick Georgi 
    Reviewed-on: http://review.coreboot.org/11217
    Tested-by: build bot (Jenkins)
    Reviewed-by: Aaron Durbin

See http://review.coreboot.org/11217 for details.

-gerrit