Change in flashrom[master]: [RFC]Don't make layoutfile and --ifd mutually exclusive

[Arthur Heymans (Code Review)]

Hello build bot (Jenkins), Nico Huber,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/23678

to look at the new patch set (#3).

Change subject: [RFC]Don't make layoutfile and --ifd mutually exclusive
......................................................................

[RFC]Don't make layoutfile and --ifd mutually exclusive

Simply append the --ifd entries to the entries found in the layout
file.

When there are multiple entries with the same name the first one
encountered will be used. If an entry occurs in the layoutfile
and is generated the ifd the one in the layoutfile will take
precedence.

Change-Id: I8602196e56e8903a4a22f8070a97f39628e0cc13
Signed-off-by: Arthur Heymans 
---
M cli_classic.c
M flash.h
M layout.c
3 files changed, 33 insertions(+), 22 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/78/23678/3