diff options
| -rw-r--r-- | flash.h | 2 | ||||
| -rw-r--r-- | flashrom.c | 3 | ||||
| -rw-r--r-- | layout.c | 11 |
3 files changed, 7 insertions, 9 deletions
@@ -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); @@ -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); // //////////////////////////////////////////////////////////// @@ -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; |
