[coreboot] Patch merged into coreboot/master: 9ad1f56 armv7: dynamically calculate the branch offset in cbfstool

the following patch was just integrated into master:
commit 9ad1f56951df3d3877b9ae588909b1cb059c1cd7
Author: David Hendricks 
Date:   Wed Jan 9 17:45:19 2013 -0800

armv7: dynamically calculate the branch offset in cbfstool

This tidies up the ARMV7 case when creating cbfs:
    - Calculate the offset using the size of the master header and offsets
      rather than using a magic constant.
    - Re-order some assignments so things happen in a logical order.

Change-Id: Id9cdbc3389c8bb504fa99436c9771936cc4c1c23
    Signed-off-by: David Hendricks 
    Reviewed-on: http://review.coreboot.org/2125
    Tested-by: build bot (Jenkins)
    Reviewed-by: Ronald G. Minnich

Build-Tested: build bot (Jenkins) at Thu Jan 10 03:03:30 2013, giving +1
Reviewed-By: Ronald G. Minnich  at Thu Jan 10 18:01:13 2013, giving +2
See http://review.coreboot.org/2125 for details.

-gerrit