[flashrom-gerrit] Change in flashrom[master]: fmap.c: Port to upstream

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/47065 )

Change subject: fmap.c: Port to upstream
......................................................................

fmap.c: Port to upstream

Change-Id: I489761f531c3a44978f6450cdd0f1ff991f13d87
Signed-off-by: Edward O'Callaghan 
---
M fmap.c
M layout.h
2 files changed, 2 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/47065/1

diff --git a/fmap.c b/fmap.c
index 8155aa3..fb6e0d3 100644
--- a/fmap.c
+++ b/fmap.c
@@ -609,7 +609,7 @@
 {
    struct flashctx *flash = handle;

-	return read_flash(flash, dest, offset, size);
+	return flash->chip->read(flash, dest, offset, size);
 }

int get_fmap_entries(const char *filename, struct flashctx *flash)
diff --git a/layout.h b/layout.h
index 8e4eb13..b32d0ca 100644
--- a/layout.h
+++ b/layout.h
@@ -40,6 +40,7 @@
    chipoff_t end;
    bool included;
    char *name;
+	char file[256];  /* file[0]=='\0' means not specified. */
 };

struct flashrom_layout {