diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2007-05-24 08:48:10 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-05-24 08:48:10 +0000 |
| commit | 8924fdd22b2399bb09a09b4b35317202c391f858 (patch) | |
| tree | 52f7f4d90736a3fa2d358bb2e8e0b4af88f85fb6 /util/flashrom/sharplhf00l04.c | |
| parent | a18501dae89c0ede2a208f8f72449e2357d2c88b (diff) | |
factor out register mapping code (trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2691 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/sharplhf00l04.c')
| -rw-r--r-- | util/flashrom/sharplhf00l04.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c index a4d086e1ea..1caedd0b67 100644 --- a/util/flashrom/sharplhf00l04.c +++ b/util/flashrom/sharplhf00l04.c @@ -48,7 +48,6 @@ void print_lhf00l04_status(uint8_t status) int probe_lhf00l04(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; - volatile uint8_t *registers; uint8_t id1, id2; #if 0 @@ -75,24 +74,12 @@ int probe_lhf00l04(struct flashchip *flash) printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - if (id1 == flash->manufacture_id && id2 == flash->model_id) { - size_t size = flash->total_size * 1024; - // we need to mmap the write-protect space. - registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, - fd_mem, (off_t) (0 - 0x400000 - size)); - if (registers == MAP_FAILED) { - // it's this part but we can't map it ... - perror("Can't mmap memory using " MEM_DEV); - exit(1); - } - - flash->virtual_registers = registers; - printf("bios %p, *bios 0x%x, bios[1] 0x%x\n", bios, *bios, - bios[1]); - return 1; - } + if (id1 != flash->manufacture_id || id2 != flash->model_id) + return 0; + + map_flash_registers(flash); - return 0; + return 1; } uint8_t wait_lhf00l04(volatile uint8_t *bios) |