From f5fb51c4ba3dae5ed78a10fb9280efa096609de5 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 19 Aug 2009 15:19:18 +0000 Subject: Adept layout handling to new programmer infrastructure and fix off-by-one error Flashrom has the ability to use layout files with romentries, but this feature was not adapted to the programmer infrastructure and had undefined behaviour for flasher!=internal. The romentry handling had an off-by-one error which caused all copies to end up one byte short. Fix these issues. Corresponding to flashrom svn r694. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Reinauer --- flash.h | 2 +- flashrom.c | 3 +-- layout.c | 11 +++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/flash.h b/flash.h index c5234dcf..d3e2e309 100644 --- a/flash.h +++ b/flash.h @@ -422,7 +422,7 @@ char *strcat_realloc(char *dest, const char *src); int show_id(uint8_t *bios, int size, int force); int read_romlayout(char *name); int find_romentry(char *name); -int handle_romentries(uint8_t *buffer, uint8_t *content); +int handle_romentries(uint8_t *buffer, struct flashchip *flash); /* cbtable.c */ int coreboot_init(void); diff --git a/flashrom.c b/flashrom.c index b531699b..fc803015 100644 --- a/flashrom.c +++ b/flashrom.c @@ -930,8 +930,7 @@ int main(int argc, char *argv[]) // This should be moved into each flash part's code to do it // cleanly. This does the job. - /* FIXME: Adapt to the external flasher infrastructure. */ - handle_romentries(buf, (uint8_t *) flash->virtual_memory); + handle_romentries(buf, flash); // //////////////////////////////////////////////////////////// diff --git a/layout.c b/layout.c index 68684a7e..c432ebe8 100644 --- a/layout.c +++ b/layout.c @@ -196,11 +196,11 @@ int find_romentry(char *name) return -1; } -int handle_romentries(uint8_t *buffer, uint8_t *content) +int handle_romentries(uint8_t *buffer, struct flashchip *flash) { int i; - // This function does not safe flash write cycles. + // This function does not save flash write cycles. // // Also it does not cope with overlapping rom layout // sections. @@ -220,10 +220,9 @@ int handle_romentries(uint8_t *buffer, uint8_t *content) if (rom_entries[i].included) continue; - /* FIXME: Adapt to the external flasher infrastructure. */ - memcpy(buffer + rom_entries[i].start, - content + rom_entries[i].start, - rom_entries[i].end - rom_entries[i].start); + flash->read(flash, buffer + rom_entries[i].start, + rom_entries[i].start, + rom_entries[i].end - rom_entries[i].start + 1); } return 0; -- cgit v1.2.3