[coreboot-gerrit] Patch merged into coreboot/master: cbfstool: don't rewrite param.baseaddress in cbfs_add

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 9a17d04e40b3f45f348963b8e3154fd3b869697b
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Wed Jan 20 18:45:07 2016 +0100

    cbfstool: don't rewrite param.baseaddress in cbfs_add
    
    cbfs_add calculated a base address out of the alignment specification
    and stored it in param.baseaddress.
    This worked when every cbfstool invocation only added a single file, but
    with -r REGION1,REGION2,... multiple additions can happen.
    In that case, the second (and later) additions would have both alignment
    and baseaddress set, which isn't allowed, aborting the process.
    
    Change-Id: I8c5a512dbe3c97e08c5bcd92b5541b58f65c63b3
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Reviewed-on: https://review.coreboot.org/13063
    Tested-by: build bot (Jenkins)
    Reviewed-by: Stefan Reinauer <stefan.reinauer at coreboot.org>


See https://review.coreboot.org/13063 for details.

-gerrit