tree c3972b33a5b2d050e665090b3cb299191b4aa1cd
parent 738f8e275609455187ae2d70c14e6e527e3210bc
author Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> 1288667571 +0000
committer Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> 1288667571 +0000

Change semantics of image building in the layout code

If a layout file was specified, all regions not mentioned in the layout
file were taken from the new image instead of being preserved.
If regions overlap, the non-included regions won.

New behaviour:
If a layout file is specified, only the regions explicitly requested for
inclusion will be taken from the new image.
If regions overlap, the included regions win.

Corresponding to flashrom svn r1223.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: David Hendricks <dhendrix@google.com>