GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

big cosmetic offensive on flashrom. (trivial) 

* Give decent names to virt_addr and virt_addr_2
* add some comments
* move virtual addresses to the end of the struct,
  so they dont mess up the initializer.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2689 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2007-05-23 17:20:56 +00:00 committed by Stefan Reinauer
parent f2d1428120
commit f8eea5cd1c
17 changed files with 183 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
util/flashrom/82802ab.c
View File

@ -48,7 +48,8 @@ void print_82802ab_status(uint8_t status)
int probe_82802ab(struct flashchip *flash) int probe_82802ab(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
volatile uint8_t *registers;
uint8_t id1, id2; uint8_t id1, id2;
#if 0 #if 0
@ -65,28 +66,28 @@ int probe_82802ab(struct flashchip *flash)
id1 = *(volatile uint8_t *)bios; id1 = *(volatile uint8_t *)bios;
id2 = *(volatile uint8_t *)(bios + 0x01); id2 = *(volatile uint8_t *)(bios + 0x01);
#if 1 /* Leave ID mode */
*(volatile uint8_t *)(bios + 0x5555) = 0xAA; *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
*(volatile uint8_t *)(bios + 0x2AAA) = 0x55; *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
*(volatile uint8_t *)(bios + 0x5555) = 0xF0; *(volatile uint8_t *)(bios + 0x5555) = 0xF0;
#endif
myusec_delay(10); myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
if (id1 == flash->manufacture_id && id2 == flash->model_id) { if (id1 == flash->manufacture_id && id2 == flash->model_id) {
size_t size = flash->total_size * 1024; size_t size = flash->total_size * 1024;
// we need to mmap the write-protect space. // we need to mmap the write-protect space.
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) (0 - 0x400000 - size)); fd_mem, (off_t) (0 - 0x400000 - size));
if (bios == MAP_FAILED) { if (registers == MAP_FAILED) {
// it's this part but we can't map it ... // it's this part but we can't map it ...
perror("Error MMAP memory using " MEM_DEV); perror("Error MMAP memory using " MEM_DEV);
exit(1); exit(1);
} }
flash->virt_addr_2 = bios; flash->virtual_registers = registers;
return 1; return 1;
} }
@ -123,8 +124,8 @@ uint8_t wait_82802ab(volatile uint8_t *bios)
} }
int erase_82802ab_block(struct flashchip *flash, int offset) int erase_82802ab_block(struct flashchip *flash, int offset)
{ {
volatile uint8_t *bios = flash->virt_addr + offset; volatile uint8_t *bios = flash->virtual_memory + offset;
volatile uint8_t *wrprotect = flash->virt_addr_2 + offset + 2; volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2;
uint8_t status; uint8_t status;
// clear status register // clear status register
@ -141,7 +142,7 @@ int erase_82802ab_block(struct flashchip *flash, int offset)
*(volatile uint8_t *)(bios) = 0xd0; *(volatile uint8_t *)(bios) = 0xd0;
myusec_delay(10); myusec_delay(10);
// now let's see what the register is // now let's see what the register is
status = wait_82802ab(flash->virt_addr); status = wait_82802ab(flash->virtual_memory);
//print_82802ab_status(status); //print_82802ab_status(status);
printf("DONE BLOCK 0x%x\n", offset); printf("DONE BLOCK 0x%x\n", offset);
return (0); return (0);
@ -178,7 +179,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
erase_82802ab(flash); erase_82802ab(flash);
if (*bios != 0xff) { if (*bios != 0xff) {

6
util/flashrom/am29f040b.c
View File

@ -75,7 +75,7 @@ static __inline__ int write_sector_29f040b(volatile uint8_t *bios,
int probe_29f040b(struct flashchip *flash) int probe_29f040b(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t id1, id2; uint8_t id1, id2;
*(bios + 0x555) = 0xAA; *(bios + 0x555) = 0xAA;
@ -98,7 +98,7 @@ int probe_29f040b(struct flashchip *flash)
int erase_29f040b(struct flashchip *flash) int erase_29f040b(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
*(bios + 0x555) = 0xAA; *(bios + 0x555) = 0xAA;
*(bios + 0x2AA) = 0x55; *(bios + 0x2AA) = 0x55;
@ -118,7 +118,7 @@ int write_29f040b(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
printf("Programming page "); printf("Programming page ");
for (i = 0; i < total_size / page_size; i++) { for (i = 0; i < total_size / page_size; i++) {

7
util/flashrom/flash.h
View File

@ -36,7 +36,6 @@ struct flashchip {
int manufacture_id; int manufacture_id;
int model_id; int model_id;
volatile uint8_t *virt_addr;
int total_size; int total_size;
int page_size; int page_size;
@ -45,7 +44,11 @@ struct flashchip {
int (*write) (struct flashchip *flash, uint8_t *buf); int (*write) (struct flashchip *flash, uint8_t *buf);
int (*read) (struct flashchip *flash, uint8_t *buf); int (*read) (struct flashchip *flash, uint8_t *buf);
volatile uint8_t *virt_addr_2; /* some flash devices have an additional
* register space
*/
volatile uint8_t *virtual_memory;
volatile uint8_t *virtual_registers;
}; };
extern struct flashchip flashchips[]; extern struct flashchip flashchips[];

216
util/flashrom/flashchips.c
View File

@ -3,22 +3,21 @@
* *
* Copyright 2000 Silicon Integrated System Corporation * Copyright 2000 Silicon Integrated System Corporation
* Copyright 2004 Tyan Corp * Copyright 2004 Tyan Corp
* yhlu yhlu@tyan.com add exclude start and end option * Copyright 2005-2007 coresystems GmbH <stepan@openbios.org>
* Copyright 2005 coresystems GmbH <stepan@openbios.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
@ -41,108 +40,107 @@
#include "sst_fwhub.h" #include "sst_fwhub.h"
struct flashchip flashchips[] = { struct flashchip flashchips[] = {
{"Am29F040B", AMD_ID, AM_29F040B, NULL, 512, 64 * 1024, {"Am29F040B", AMD_ID, AM_29F040B, 512, 64 * 1024,
probe_29f040b, erase_29f040b, write_29f040b, NULL}, probe_29f040b, erase_29f040b, write_29f040b},
{"Am29F016D", AMD_ID, AM_29F016D, NULL, 2048, 64 * 1024, {"Am29F016D", AMD_ID, AM_29F016D, 2048, 64 * 1024,
probe_29f040b, erase_29f040b, write_29f040b, NULL}, probe_29f040b, erase_29f040b, write_29f040b},
{"AE49F2008", ASD_ID, ASD_AE49F2008, NULL, 256, 128, {"AE49F2008", ASD_ID, ASD_AE49F2008, 256, 128,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"At29C040A", ATMEL_ID, AT_29C040A, NULL, 512, 256, {"At29C040A", ATMEL_ID, AT_29C040A, 512, 256,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"At29C020", ATMEL_ID, AT_29C020, NULL, 256, 256, {"At29C020", ATMEL_ID, AT_29C020, 256, 256,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"Mx29f002", MX_ID, MX_29F002, NULL, 256, 64 * 1024, {"Mx29f002", MX_ID, MX_29F002, 256, 64 * 1024,
probe_29f002, erase_29f002, write_29f002, NULL}, probe_29f002, erase_29f002, write_29f002},
{"SST29EE020A", SST_ID, SST_29EE020A, NULL, 256, 128, {"SST29EE020A", SST_ID, SST_29EE020A, 256, 128,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"SST28SF040A", SST_ID, SST_28SF040, NULL, 512, 256, {"SST28SF040A", SST_ID, SST_28SF040, 512, 256,
probe_28sf040, erase_28sf040, write_28sf040, NULL}, probe_28sf040, erase_28sf040, write_28sf040},
{"SST39SF010A", SST_ID, SST_39SF010, NULL, 128, 4096, {"SST39SF010A", SST_ID, SST_39SF010, 128, 4096,
probe_jedec, erase_chip_jedec, write_39sf020,NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"SST39SF020A", SST_ID, SST_39SF020, NULL, 256, 4096, {"SST39SF020A", SST_ID, SST_39SF020, 256, 4096,
probe_jedec, erase_chip_jedec, write_39sf020,NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"SST39SF040", SST_ID, SST_39SF040, NULL, 512, 4096, {"SST39SF040", SST_ID, SST_39SF040, 512, 4096,
probe_jedec, erase_chip_jedec, write_39sf020,NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"SST39VF020", SST_ID, SST_39VF020, NULL, 256, 4096, {"SST39VF020", SST_ID, SST_39VF020, 256, 4096,
probe_jedec, erase_chip_jedec, write_39sf020,NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
// assume similar to 004B, ignoring data sheet // assume similar to 004B, ignoring data sheet
{"SST49LF040B", SST_ID, SST_49LF040B, NULL, 512, 64 * 1024, {"SST49LF040B", SST_ID, SST_49LF040B, 512, 64 * 1024,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL}, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub},
{"SST49LF040", SST_ID, SST_49LF040, NULL, 512, 4096, {"SST49LF040", SST_ID, SST_49LF040, 512, 4096,
probe_jedec, erase_49lf040, write_49lf040,NULL}, probe_jedec, erase_49lf040, write_49lf040},
{"SST49LF020A", SST_ID, SST_49LF020A, NULL, 256, 16 * 1024, {"SST49LF020A", SST_ID, SST_49LF020A, 256, 16 * 1024,
probe_jedec, erase_49lf040, write_49lf040,NULL}, probe_jedec, erase_49lf040, write_49lf040},
{"SST49LF080A", SST_ID, SST_49LF080A, NULL, 1024, 4096, {"SST49LF080A", SST_ID, SST_49LF080A, 1024, 4096,
probe_jedec, erase_49lf040, write_49lf040,NULL}, probe_jedec, erase_49lf040, write_49lf040},
{"SST49LF002A/B", SST_ID, SST_49LF002A, NULL, 256, 16 * 1024, {"SST49LF002A/B", SST_ID, SST_49LF002A, 256, 16 * 1024,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub, NULL}, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub},
{"SST49LF003A/B", SST_ID, SST_49LF003A, NULL, 384, 64 * 1024, {"SST49LF003A/B", SST_ID, SST_49LF003A, 384, 64 * 1024,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL}, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub},
{"SST49LF004A/B", SST_ID, SST_49LF004A, NULL, 512, 64 * 1024, {"SST49LF004A/B", SST_ID, SST_49LF004A, 512, 64 * 1024,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL}, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub},
{"SST49LF008A", SST_ID, SST_49LF008A, NULL, 1024, 64 * 1024 , {"SST49LF008A", SST_ID, SST_49LF008A, 1024, 64 * 1024 ,
probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub, NULL}, probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub},
{"Pm49FL002", PMC_ID, PMC_49FL002, NULL, 256, 16 * 1024, {"Pm49FL002", PMC_ID, PMC_49FL002, 256, 16 * 1024,
probe_jedec, erase_chip_jedec, write_49fl004,NULL}, probe_jedec, erase_chip_jedec, write_49fl004},
{"SST49LF004C", SST_ID, SST_49LF004C, NULL, 512, 4 * 1024, {"SST49LF004C", SST_ID, SST_49LF004C, 512, 4 * 1024,
probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc,NULL}, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc},
{"SST49LF008C", SST_ID, SST_49LF008C, NULL, 1024, 4 * 1024 , {"SST49LF008C", SST_ID, SST_49LF008C, 1024, 4 * 1024 ,
probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc, NULL}, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc},
{"SST49LF016C", SST_ID, SST_49LF016C, NULL, 2048, 4 * 1024 , {"SST49LF016C", SST_ID, SST_49LF016C, 2048, 4 * 1024 ,
probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc, NULL}, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc},
{"SST49LF160C", SST_ID, SST_49LF160C, NULL, 2048, 4 * 1024 , {"SST49LF160C", SST_ID, SST_49LF160C, 2048, 4 * 1024 ,
probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc, NULL}, probe_49lfxxxc, erase_49lfxxxc, write_49lfxxxc},
{"Pm49FL004", PMC_ID, PMC_49FL004, NULL, 512, 64 * 1024, {"Pm49FL004", PMC_ID, PMC_49FL004, 512, 64 * 1024,
probe_jedec, erase_chip_jedec, write_49fl004,NULL}, probe_jedec, erase_chip_jedec, write_49fl004},
{"W29C011", WINBOND_ID, W_29C011, NULL, 128, 128, {"W29C011", WINBOND_ID, W_29C011, 128, 128,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"W29C020C", WINBOND_ID, W_29C020C, NULL, 256, 128, {"W29C020C", WINBOND_ID, W_29C020C, 256, 128,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"W49F002U", WINBOND_ID, W_49F002U, NULL, 256, 128, {"W49F002U", WINBOND_ID, W_49F002U, 256, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"W49V002A", WINBOND_ID, W_49V002A, NULL, 256, 128, {"W49V002A", WINBOND_ID, W_49V002A, 256, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"W49V002FA", WINBOND_ID, W_49V002FA, NULL, 256, 128, {"W49V002FA", WINBOND_ID, W_49V002FA, 256, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"W39V040FA", WINBOND_ID, W_39V040FA, NULL, 512, 64*1024, {"W39V040FA", WINBOND_ID, W_39V040FA, 512, 64*1024,
probe_jedec, erase_chip_jedec, write_39sf020, NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"W39V040A", WINBOND_ID, W_39V040A, NULL, 512, 64*1024, {"W39V040A", WINBOND_ID, W_39V040A, 512, 64*1024,
probe_jedec, erase_chip_jedec, write_39sf020, NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"W39V040B", WINBOND_ID, W_39V040B, NULL, 512, 64*1024, {"W39V040B", WINBOND_ID, W_39V040B, 512, 64*1024,
probe_jedec, erase_chip_jedec, write_39sf020, NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"W39V080A", WINBOND_ID, W_39V080A, NULL, 1024, 64*1024, {"W39V080A", WINBOND_ID, W_39V080A, 1024, 64*1024,
probe_jedec, erase_chip_jedec, write_39sf020, NULL}, probe_jedec, erase_chip_jedec, write_39sf020},
{"M29F002B", ST_ID, ST_M29F002B, NULL, 256, 64 * 1024, {"M29F002B", ST_ID, ST_M29F002B, 256, 64 * 1024,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"M29F002T/NT", ST_ID, ST_M29F002T, NULL, 256, 64 * 1024, {"M29F002T/NT", ST_ID, ST_M29F002T, 256, 64 * 1024,
probe_jedec, erase_chip_jedec, write_jedec, NULL}, probe_jedec, erase_chip_jedec, write_jedec},
{"M29F400BT", ST_ID, ST_M29F400BT, NULL, 512, 64 * 1024, {"M29F400BT", ST_ID, ST_M29F400BT, 512, 64 * 1024,
probe_m29f400bt, erase_m29f400bt, write_linuxbios_m29f400bt, NULL}, probe_m29f400bt, erase_m29f400bt, write_linuxbios_m29f400bt},
{"M29F040B", ST_ID, ST_M29F040B, NULL, 512, 64 * 1024, {"M29F040B", ST_ID, ST_M29F040B, 512, 64 * 1024,
probe_29f040b, erase_29f040b, write_29f040b, NULL}, probe_29f040b, erase_29f040b, write_29f040b},
{"82802ab", 137, 173, NULL, 512, 64 * 1024, {"82802ab", 137, 173, 512, 64 * 1024,
probe_82802ab, erase_82802ab, write_82802ab, NULL}, probe_82802ab, erase_82802ab, write_82802ab},
{"82802ac", 137, 172, NULL, 1024, 64 * 1024, {"82802ac", 137, 172, 1024, 64 * 1024,
probe_82802ab, erase_82802ab, write_82802ab, NULL}, probe_82802ab, erase_82802ab, write_82802ab},
{"F49B002UA", EMST_ID, EMST_F49B002UA, NULL, 256, 4096, {"F49B002UA", EMST_ID, EMST_F49B002UA, 256, 4096,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
#ifndef DISABLE_DOC #ifndef DISABLE_DOC
{"MD-2802 (M-Systems DiskOnChip Millennium Module)", {"MD-2802 (M-Systems DiskOnChip Millennium Module)",
MSYSTEMS_ID, MSYSTEMS_MD2802, MSYSTEMS_ID, MSYSTEMS_MD2802,8, 8 * 1024,
NULL, 8, 8 * 1024,
probe_md2802, erase_md2802, write_md2802, read_md2802}, probe_md2802, erase_md2802, write_md2802, read_md2802},
#endif #endif
{"LHF00L04", SHARP_ID, SHARP_LHF00L04, NULL, 1024, 64 * 1024, {"LHF00L04", SHARP_ID, SHARP_LHF00L04, 1024, 64 * 1024,
probe_lhf00l04, erase_lhf00l04, write_lhf00l04, NULL}, probe_lhf00l04, erase_lhf00l04, write_lhf00l04},
{"S29C51001T", SYNCMOS_ID, S29C51001T, NULL, 128, 128, {"S29C51001T", SYNCMOS_ID, S29C51001T, 128, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"S29C51002T", SYNCMOS_ID, S29C51002T, NULL, 256, 128, {"S29C51002T", SYNCMOS_ID, S29C51002T, 256, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"S29C51004T", SYNCMOS_ID, S29C51004T, NULL, 512, 128, {"S29C51004T", SYNCMOS_ID, S29C51004T, 512, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{"S29C31004T", SYNCMOS_ID, S29C31004T, NULL, 512, 128, {"S29C31004T", SYNCMOS_ID, S29C31004T, 512, 128,
probe_jedec, erase_chip_jedec, write_49f002, NULL}, probe_jedec, erase_chip_jedec, write_49f002},
{NULL,} {NULL,}
}; };

10
util/flashrom/flashrom.c
View File

@ -139,7 +139,7 @@ struct flashchip *probe_flash(struct flashchip *flash)
perror("Error: Can't mmap " MEM_DEV "."); perror("Error: Can't mmap " MEM_DEV ".");
exit(1); exit(1);
} }
flash->virt_addr = bios; flash->virtual_memory = bios;
if (flash->probe(flash) == 1) { if (flash->probe(flash) == 1) {
printf("%s found at physical address: 0x%lx\n", printf("%s found at physical address: 0x%lx\n",
@ -157,7 +157,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf)
{ {
int idx; int idx;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
printf("Verifying flash "); printf("Verifying flash ");
@ -388,7 +388,7 @@ int main(int argc, char *argv[])
} }
printf("Reading Flash..."); printf("Reading Flash...");
if (flash->read == NULL) if (flash->read == NULL)
memcpy(buf, (const char *)flash->virt_addr, size); memcpy(buf, (const char *)flash->virtual_memory, size);
else else
flash->read(flash, buf); flash->read(flash, buf);
@ -430,7 +430,7 @@ int main(int argc, char *argv[])
// //////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////
if (exclude_end_position - exclude_start_position > 0) if (exclude_end_position - exclude_start_position > 0)
memcpy(buf + exclude_start_position, memcpy(buf + exclude_start_position,
(const char *)flash->virt_addr + exclude_start_position, (const char *)flash->virtual_memory + exclude_start_position,
exclude_end_position - exclude_start_position); exclude_end_position - exclude_start_position);
exclude_start_page = exclude_start_position / flash->page_size; exclude_start_page = exclude_start_position / flash->page_size;
@ -442,7 +442,7 @@ int main(int argc, char *argv[])
// This should be moved into each flash part's code to do it // This should be moved into each flash part's code to do it
// cleanly. This does the job. // cleanly. This does the job.
handle_romentries(buf, (uint8_t *) flash->virt_addr); handle_romentries(buf, (uint8_t *) flash->virtual_memory);
// //////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////

6
util/flashrom/jedec.c
View File

@ -35,7 +35,7 @@
int probe_jedec(struct flashchip *flash) int probe_jedec(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t id1, id2; uint8_t id1, id2;
/* Issue JEDEC Product ID Entry command */ /* Issue JEDEC Product ID Entry command */
@ -113,7 +113,7 @@ int erase_block_jedec(volatile uint8_t *bios, unsigned int block)
int erase_chip_jedec(struct flashchip *flash) int erase_chip_jedec(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
/* Issue the JEDEC Chip Erase command */ /* Issue the JEDEC Chip Erase command */
*(volatile uint8_t *)(bios + 0x5555) = 0xAA; *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
@ -230,7 +230,7 @@ int write_jedec(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
erase_chip_jedec(flash); erase_chip_jedec(flash);
// dumb check if erase was successful. // dumb check if erase was successful.

8
util/flashrom/m29f400bt.c
View File

@ -29,7 +29,7 @@
int probe_m29f400bt(struct flashchip *flash) int probe_m29f400bt(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t id1, id2; uint8_t id1, id2;
*(volatile uint8_t *)(bios + 0xAAA) = 0xAA; *(volatile uint8_t *)(bios + 0xAAA) = 0xAA;
@ -57,7 +57,7 @@ int probe_m29f400bt(struct flashchip *flash)
int erase_m29f400bt(struct flashchip *flash) int erase_m29f400bt(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
*(volatile uint8_t *)(bios + 0xAAA) = 0xAA; *(volatile uint8_t *)(bios + 0xAAA) = 0xAA;
*(volatile uint8_t *)(bios + 0x555) = 0x55; *(volatile uint8_t *)(bios + 0x555) = 0x55;
@ -96,7 +96,7 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
//erase_m29f400bt (flash); //erase_m29f400bt (flash);
printf("Programming Page:\n "); printf("Programming Page:\n ");
@ -148,7 +148,7 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf)
int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf) int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
printf("Programming Page:\n "); printf("Programming Page:\n ");
/********************************* /*********************************

6
util/flashrom/msys_doc.c
View File

@ -33,7 +33,7 @@ static void doc_write_cdsncontrol(volatile uint8_t *bios, uint8_t data);
int probe_md2802(struct flashchip *flash) int probe_md2802(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t chipid; uint8_t chipid;
#ifndef MSYSTEMS_DOC_NO_55AA_CHECKING #ifndef MSYSTEMS_DOC_NO_55AA_CHECKING
uint8_t id_0x55, id_0xAA; uint8_t id_0x55, id_0xAA;
@ -149,7 +149,7 @@ int read_md2802(struct flashchip *flash, uint8_t *buf)
int erase_md2802(struct flashchip *flash) int erase_md2802(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
return (1); return (1);
*(volatile uint8_t *)(bios + 0x5555) = 0xAA; *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
@ -166,7 +166,7 @@ int write_md2802(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
return (1); return (1);
erase_md2802(flash); erase_md2802(flash);

6
util/flashrom/mx29f002.c
View File

@ -33,7 +33,7 @@
int probe_29f002(struct flashchip *flash) int probe_29f002(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t id1, id2; uint8_t id1, id2;
*(bios + 0x5555) = 0xAA; *(bios + 0x5555) = 0xAA;
@ -56,7 +56,7 @@ int probe_29f002(struct flashchip *flash)
int erase_29f002(struct flashchip *flash) int erase_29f002(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
*(bios + 0x555) = 0xF0; *(bios + 0x555) = 0xF0;
*(bios + 0x555) = 0xAA; *(bios + 0x555) = 0xAA;
@ -89,7 +89,7 @@ int write_29f002(struct flashchip *flash, uint8_t *buf)
{ {
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
volatile uint8_t *dst = bios; volatile uint8_t *dst = bios;
*bios = 0xF0; *bios = 0xF0;

2
util/flashrom/pm49fl004.c
View File

@ -34,7 +34,7 @@ int write_49fl004(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
printf("Programming Page: "); printf("Programming Page: ");
for (i = 0; i < total_size / page_size; i++) { for (i = 0; i < total_size / page_size; i++) {

23
util/flashrom/sharplhf00l04.c
View File

@ -47,10 +47,12 @@ void print_lhf00l04_status(uint8_t status)
int probe_lhf00l04(struct flashchip *flash) int probe_lhf00l04(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
volatile uint8_t *registers;
uint8_t id1, id2; uint8_t id1, id2;
#if 0 #if 0
/* Enter ID mode */
*(volatile uint8_t *)(bios + 0x5555) = 0xAA; *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
*(volatile uint8_t *)(bios + 0x2AAA) = 0x55; *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
*(volatile uint8_t *)(bios + 0x5555) = 0x90; *(volatile uint8_t *)(bios + 0x5555) = 0x90;
@ -64,12 +66,11 @@ int probe_lhf00l04(struct flashchip *flash)
id1 = *(volatile uint8_t *)bios; id1 = *(volatile uint8_t *)bios;
id2 = *(volatile uint8_t *)(bios + 0x01); id2 = *(volatile uint8_t *)(bios + 0x01);
#if 1 /* Leave ID mode */
*(volatile uint8_t *)(bios + 0x5555) = 0xAA; *(volatile uint8_t *)(bios + 0x5555) = 0xAA;
*(volatile uint8_t *)(bios + 0x2AAA) = 0x55; *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
*(volatile uint8_t *)(bios + 0x5555) = 0xF0; *(volatile uint8_t *)(bios + 0x5555) = 0xF0;
#endif
myusec_delay(10); myusec_delay(10);
printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
@ -77,15 +78,15 @@ int probe_lhf00l04(struct flashchip *flash)
if (id1 == flash->manufacture_id && id2 == flash->model_id) { if (id1 == flash->manufacture_id && id2 == flash->model_id) {
size_t size = flash->total_size * 1024; size_t size = flash->total_size * 1024;
// we need to mmap the write-protect space. // we need to mmap the write-protect space.
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) (0 - 0x400000 - size)); fd_mem, (off_t) (0 - 0x400000 - size));
if (bios == MAP_FAILED) { if (registers == MAP_FAILED) {
// it's this part but we can't map it ... // it's this part but we can't map it ...
perror("Error MMAP /dev/mem"); perror("Error MMAP /dev/mem");
exit(1); exit(1);
} }
flash->virt_addr_2 = bios; flash->virtual_registers = registers;
printf("bios %p, *bios 0x%x, bios[1] 0x%x\n", bios, *bios, printf("bios %p, *bios 0x%x, bios[1] 0x%x\n", bios, *bios,
bios[1]); bios[1]);
return 1; return 1;
@ -124,14 +125,14 @@ uint8_t wait_lhf00l04(volatile uint8_t *bios)
} }
int erase_lhf00l04_block(struct flashchip *flash, int offset) int erase_lhf00l04_block(struct flashchip *flash, int offset)
{ {
volatile uint8_t *bios = flash->virt_addr + offset; volatile uint8_t *bios = flash->virtual_memory + offset;
volatile uint8_t *wrprotect = flash->virt_addr_2 + offset + 2; volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2;
uint8_t status; uint8_t status;
// clear status register // clear status register
*bios = 0x50; *bios = 0x50;
printf("Erase at %p\n", bios); printf("Erase at %p\n", bios);
status = wait_lhf00l04(flash->virt_addr); status = wait_lhf00l04(flash->virtual_memory);
print_lhf00l04_status(status); print_lhf00l04_status(status);
// clear write protect // clear write protect
printf("write protect is at %p\n", (wrprotect)); printf("write protect is at %p\n", (wrprotect));
@ -144,7 +145,7 @@ int erase_lhf00l04_block(struct flashchip *flash, int offset)
*(volatile uint8_t *)(bios) = 0xd0; *(volatile uint8_t *)(bios) = 0xd0;
myusec_delay(10); myusec_delay(10);
// now let's see what the register is // now let's see what the register is
status = wait_lhf00l04(flash->virt_addr); status = wait_lhf00l04(flash->virtual_memory);
print_lhf00l04_status(status); print_lhf00l04_status(status);
printf("DONE BLOCK 0x%x\n", offset); printf("DONE BLOCK 0x%x\n", offset);
return (0); return (0);
@ -181,7 +182,7 @@ int write_lhf00l04(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
erase_lhf00l04(flash); erase_lhf00l04(flash);
if (*bios != 0xff) { if (*bios != 0xff) {

6
util/flashrom/sst28sf040.c
View File

@ -105,7 +105,7 @@ static __inline__ int write_sector_28sf040(volatile uint8_t *bios,
int probe_28sf040(struct flashchip *flash) int probe_28sf040(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
uint8_t id1, id2, tmp; uint8_t id1, id2, tmp;
/* save the value at the beginning of the Flash */ /* save the value at the beginning of the Flash */
@ -134,7 +134,7 @@ int probe_28sf040(struct flashchip *flash)
int erase_28sf040(struct flashchip *flash) int erase_28sf040(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
unprotect_28sf040(bios); unprotect_28sf040(bios);
*bios = CHIP_ERASE; *bios = CHIP_ERASE;
@ -152,7 +152,7 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
unprotect_28sf040(bios); unprotect_28sf040(bios);

2
util/flashrom/sst39sf020.c
View File

@ -52,7 +52,7 @@ int write_39sf020(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
erase_chip_jedec(flash); erase_chip_jedec(flash);

4
util/flashrom/sst49lf040.c
View File

@ -34,7 +34,7 @@ int erase_49lf040(struct flashchip *flash)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
for (i = 0; i < total_size / page_size; i++) { for (i = 0; i < total_size / page_size; i++) {
/* Chip erase only works in parallel programming mode /* Chip erase only works in parallel programming mode
@ -49,7 +49,7 @@ int write_49lf040(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
printf("Programming Page: "); printf("Programming Page: ");
for (i = 0; i < total_size / page_size; i++) { for (i = 0; i < total_size / page_size; i++) {

20
util/flashrom/sst49lfxxxc.c
View File

@ -132,7 +132,9 @@ static __inline__ int write_sector_49lfxxxc(volatile uint8_t *bios,
int probe_49lfxxxc(struct flashchip *flash) int probe_49lfxxxc(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
volatile uint8_t *registers;
uint8_t id1, id2; uint8_t id1, id2;
size_t size = flash->total_size * 1024; size_t size = flash->total_size * 1024;
@ -148,25 +150,25 @@ int probe_49lfxxxc(struct flashchip *flash)
if (!(id1 == flash->manufacture_id && id2 == flash->model_id)) if (!(id1 == flash->manufacture_id && id2 == flash->model_id))
return 0; return 0;
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (bios == MAP_FAILED) { if (registers == MAP_FAILED) {
// it's this part but we can't map it ... // it's this part but we can't map it ...
perror("Error MMAP /dev/mem"); perror("Error MMAP /dev/mem");
exit(1); exit(1);
} }
flash->virt_addr_2 = bios; flash->virtual_registers = registers;
return 1; return 1;
} }
int erase_49lfxxxc(struct flashchip *flash) int erase_49lfxxxc(struct flashchip *flash)
{ {
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
volatile uint8_t *bios2 = flash->virt_addr_2; volatile uint8_t *registers = flash->virtual_registers;
int i; int i;
unsigned int total_size = flash->total_size * 1024; unsigned int total_size = flash->total_size * 1024;
write_lockbits_49lfxxxc(bios2, total_size, 0); write_lockbits_49lfxxxc(registers, total_size, 0);
for (i = 0; i < total_size; i += flash->page_size) for (i = 0; i < total_size; i += flash->page_size)
if (erase_sector_49lfxxxc(bios, i) != 0) if (erase_sector_49lfxxxc(bios, i) != 0)
return (-1); return (-1);
@ -180,9 +182,9 @@ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
write_lockbits_49lfxxxc(flash->virt_addr_2, total_size, 0); write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0);
printf("Programming Page: "); printf("Programming Page: ");
for (i = 0; i < total_size / page_size; i++) { for (i = 0; i < total_size / page_size; i++) {
/* erase the page before programming */ /* erase the page before programming */

16
util/flashrom/sst_fwhub.c
View File

@ -46,33 +46,33 @@ void print_sst_fwhub_status(uint8_t status)
/* probe_jedec works fine for probing */ /* probe_jedec works fine for probing */
int probe_sst_fwhub(struct flashchip *flash) int probe_sst_fwhub(struct flashchip *flash)
{ {
volatile uint8_t *bios; volatile uint8_t *registers;
size_t size = flash->total_size * 1024; size_t size = flash->total_size * 1024;
if (probe_jedec(flash) == 0) if (probe_jedec(flash) == 0)
return 0; return 0;
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED, registers = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1)); fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (bios == MAP_FAILED) { if (registers == MAP_FAILED) {
// it's this part but we can't map it ... // it's this part but we can't map it ...
perror("Error MMAP /dev/mem"); perror("Error MMAP /dev/mem");
exit(1); exit(1);
} }
flash->virt_addr_2 = bios; flash->virtual_registers = registers;
return 1; return 1;
} }
int erase_sst_fwhub_block(struct flashchip *flash, int offset) int erase_sst_fwhub_block(struct flashchip *flash, int offset)
{ {
volatile uint8_t *wrprotect = flash->virt_addr_2 + offset + 2; volatile uint8_t *wrprotect = flash->virtual_registers + offset + 2;
// clear write protect // clear write protect
*(wrprotect) = 0; *(wrprotect) = 0;
erase_block_jedec(flash->virt_addr, offset); erase_block_jedec(flash->virtual_memory, offset);
toggle_ready_jedec(flash->virt_addr); toggle_ready_jedec(flash->virtual_memory);
return (0); return (0);
} }
@ -92,7 +92,7 @@ int write_sst_fwhub(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
// FIXME: We want block wide erase instead of ironing the whole chip // FIXME: We want block wide erase instead of ironing the whole chip
erase_sst_fwhub(flash); erase_sst_fwhub(flash);

2
util/flashrom/w49f002u.c
View File

@ -36,7 +36,7 @@ int write_49f002(struct flashchip *flash, uint8_t *buf)
int i; int i;
int total_size = flash->total_size * 1024; int total_size = flash->total_size * 1024;
int page_size = flash->page_size; int page_size = flash->page_size;
volatile uint8_t *bios = flash->virt_addr; volatile uint8_t *bios = flash->virtual_memory;
erase_chip_jedec(flash); erase_chip_jedec(flash);