Patch merged into coreboot/master: cbfstool: move tests for fixed-location files earlier

the following patch was just integrated into master:
commit aa44dbd364bfb36b3cb4eb2fb3f9ee292610ccf4
Author: Patrick Georgi 
Date:   Wed Aug 12 12:05:21 2015 +0200

cbfstool: move tests for fixed-location files earlier

... and the assert is gone.
    The actual action of adding a just-right file can be moved after the tests
    since it's exactly the condition those tests don't continue or break on.

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

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

-gerrit