summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/flashrom/82802ab.c2
-rw-r--r--util/flashrom/flash.h19
-rw-r--r--util/flashrom/flash_rom.c69
-rw-r--r--util/flashrom/lbtable.c10
-rw-r--r--util/flashrom/sharplhf00l04.c2
-rw-r--r--util/flashrom/sst49lfxxxc.c2
-rw-r--r--util/flashrom/sst_fwhub.c2
-rw-r--r--util/flashrom/udelay.c6
8 files changed, 51 insertions, 61 deletions
diff --git a/util/flashrom/82802ab.c b/util/flashrom/82802ab.c
index 99776a1f88..c0f60efc7f 100644
--- a/util/flashrom/82802ab.c
+++ b/util/flashrom/82802ab.c
@@ -79,7 +79,7 @@ int probe_82802ab(struct flashchip *flash)
size_t size = flash->total_size * 1024;
// we need to mmap the write-protect space.
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- flash->fd_mem, (off_t) (0 - 0x400000 - size));
+ fd_mem, (off_t) (0 - 0x400000 - size));
if (bios == MAP_FAILED) {
// it's this part but we can't map it ...
perror("Error MMAP memory using " MEM_DEV );
diff --git a/util/flashrom/flash.h b/util/flashrom/flash.h
index 9f743ddc35..b22227d22d 100644
--- a/util/flashrom/flash.h
+++ b/util/flashrom/flash.h
@@ -45,7 +45,6 @@ struct flashchip {
int (*write) (struct flashchip *flash, uint8_t *buf);
int (*read) (struct flashchip *flash, uint8_t *buf);
- int fd_mem;
volatile uint8_t *virt_addr_2;
};
@@ -126,17 +125,17 @@ extern struct flashchip flashchips[];
/* function prototypes from udelay.h */
-extern void myusec_delay(int time);
-extern void myusec_calibrate_delay();
+void myusec_delay(int time);
+void myusec_calibrate_delay();
/* pci handling for board/chipset_enable */
-extern struct pci_access *pacc; /* For board and chipset_enable */
-extern struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device);
-extern struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
- uint16_t card_vendor, uint16_t card_device);
+struct pci_access *pacc; /* For board and chipset_enable */
+struct pci_dev *pci_dev_find(uint16_t vendor, uint16_t device);
+struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device,
+ uint16_t card_vendor, uint16_t card_device);
-extern int board_flash_enable(char *vendor, char *part); /* board_enable.c */
-extern int chipset_flash_enable(void); /* chipset_enable.c */
+int board_flash_enable(char *vendor, char *part); /* board_enable.c */
+int chipset_flash_enable(void); /* chipset_enable.c */
/* physical memory mapping device */
@@ -146,4 +145,6 @@ extern int chipset_flash_enable(void); /* chipset_enable.c */
# define MEM_DEV "/dev/mem"
#endif
+extern int fd_mem;
+
#endif /* !__FLASH_H__ */
diff --git a/util/flashrom/flash_rom.c b/util/flashrom/flash_rom.c
index ba391cba90..60c33c0328 100644
--- a/util/flashrom/flash_rom.c
+++ b/util/flashrom/flash_rom.c
@@ -4,7 +4,7 @@
* Copyright 2000 Silicon Integrated System Corporation
* Copyright 2004 Tyan Corp
* yhlu yhlu@tyan.com add exclude start and end option
- * Copyright 2005-2006 coresystems GmbH
+ * Copyright 2005-2007 coresystems GmbH
* Stefan Reinauer <stepan@coresystems.de> added rom layout
* support, and checking for suitable rom image, various fixes
* support for flashing the Technologic Systems 5300.
@@ -55,6 +55,8 @@ struct pci_access *pacc; /* For board and chipset_enable */
int exclude_start_page, exclude_end_page;
int force=0, verbose=0;
+int fd_mem;
+
/*
*
*/
@@ -101,66 +103,53 @@ pci_card_find(uint16_t vendor, uint16_t device,
struct flashchip *probe_flash(struct flashchip *flash)
{
- int fd_mem;
volatile uint8_t *bios;
- unsigned long size;
-
- if ((fd_mem = open(MEM_DEV, O_RDWR)) < 0) {
- perror("Error: Can not access memory using " MEM_DEV ". You need to be root.");
- exit(1);
- }
+ unsigned long flash_baseaddr, size;
while (flash->name != NULL) {
if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0) {
flash++;
continue;
}
- printf_debug("Trying %s, %d KB\n", flash->name, flash->total_size);
+ printf_debug("Probing for %s, %d KB\n",
+ flash->name, flash->total_size);
+
size = flash->total_size * 1024;
- /* BUG? what happens if getpagesize() > size!?
- -> ``Error MMAP /dev/mem: Invalid argument'' NIKI */
+
+#ifdef TS5300
+ // FIXME: Wrong place for this decision
+ flash_baseaddr = 0x9400000;
+#else
+ flash_baseaddr = (0xffffffff - size + 1);
+#endif
+
+ /* If getpagesize() > size ->
+ * `Error MMAP /dev/mem: Invalid argument'
+ * This should never happen as we don't support any flash chips
+ * smaller than 4k or 8k yet.
+ */
+
if (getpagesize() > size) {
size = getpagesize();
- printf("%s: warning: size: %d -> %ld\n",
- __FUNCTION__, flash->total_size * 1024,
- (unsigned long) size);
+ printf("WARNING: size: %d -> %ld (page size)\n",
+ flash->total_size * 1024, (unsigned long) size);
}
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- fd_mem, (off_t) (0xffffffff - size + 1));
+ fd_mem, (off_t)flash_baseaddr );
if (bios == MAP_FAILED) {
perror("Error: Can't mmap " MEM_DEV ".");
exit(1);
}
flash->virt_addr = bios;
- flash->fd_mem = fd_mem;
if (flash->probe(flash) == 1) {
printf("%s found at physical address: 0x%lx\n",
- flash->name, (0xffffffff - size + 1));
+ flash->name, flash_baseaddr);
return flash;
}
munmap((void *) bios, size);
-#ifdef TS5300
- /* TS-5300 */
- bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- fd_mem, (off_t) (0x9400000));
- if (bios == MAP_FAILED) {
- perror("Error: Can't mmap " MEM_DEV ".");
- exit(1);
- }
- flash->virt_addr = bios;
- flash->fd_mem = fd_mem;
- if (flash->probe(flash) == 1) {
- printf("TS-5300 %s found at physical address: 0x%lx\n",
- flash->name, 0x9400000UL);
- return flash;
- }
- munmap((void *) bios, size);
- /* TS-5300 */
-#endif
-
flash++;
}
return NULL;
@@ -351,9 +340,13 @@ int main(int argc, char *argv[])
pci_init(pacc); /* Initialize the PCI library */
pci_scan_bus(pacc); /* We want to get the list of devices */
- printf("Calibrating delay loop... ");
+ /* Open the memory device. A lot of functions need it */
+ if ((fd_mem = open(MEM_DEV, O_RDWR)) < 0) {
+ perror("Error: Can not access memory using " MEM_DEV ". You need to be root.");
+ exit(1);
+ }
+
myusec_calibrate_delay();
- printf("ok\n");
/* We look at the lbtable first to see if we need a
* mainboard specific flash enable sequence.
diff --git a/util/flashrom/lbtable.c b/util/flashrom/lbtable.c
index 2adf5c9c36..4409e51d8f 100644
--- a/util/flashrom/lbtable.c
+++ b/util/flashrom/lbtable.c
@@ -158,14 +158,8 @@ int linuxbios_init(void)
struct lb_header *lb_table;
struct lb_record *rec, *last;
- int fd;
- fd = open(MEM_DEV, O_RDONLY);
- if (fd < 0) {
- fprintf(stderr, "Can not access memory using " MEM_DEV "\n");
- exit(-1);
- }
- low_1MB = mmap(0, 1024*1024, PROT_READ, MAP_SHARED, fd, 0x00000000);
- if (low_1MB == ((void *) -1)) {
+ low_1MB = mmap(0, 1024*1024, PROT_READ, MAP_SHARED, fd_mem, 0x00000000);
+ if (low_1MB == MAP_FAILED) {
fprintf(stderr, "Can not mmap " MEM_DEV " at %08lx errno(%d):%s\n",
0x00000000UL, errno, strerror(errno));
exit(-2);
diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c
index af65585fc0..fc41fbf600 100644
--- a/util/flashrom/sharplhf00l04.c
+++ b/util/flashrom/sharplhf00l04.c
@@ -78,7 +78,7 @@ int probe_lhf00l04(struct flashchip *flash)
size_t size = flash->total_size * 1024;
// we need to mmap the write-protect space.
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- flash->fd_mem, (off_t) (0 - 0x400000 - size));
+ fd_mem, (off_t) (0 - 0x400000 - size));
if (bios == MAP_FAILED) {
// it's this part but we can't map it ...
perror("Error MMAP /dev/mem");
diff --git a/util/flashrom/sst49lfxxxc.c b/util/flashrom/sst49lfxxxc.c
index 4486186bd7..522cb9b7c3 100644
--- a/util/flashrom/sst49lfxxxc.c
+++ b/util/flashrom/sst49lfxxxc.c
@@ -151,7 +151,7 @@ int probe_49lfxxxc(struct flashchip *flash)
return 0;
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- flash->fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
+ fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (bios == MAP_FAILED) {
// it's this part but we can't map it ...
perror("Error MMAP /dev/mem");
diff --git a/util/flashrom/sst_fwhub.c b/util/flashrom/sst_fwhub.c
index 5d811a6f02..530f726d4b 100644
--- a/util/flashrom/sst_fwhub.c
+++ b/util/flashrom/sst_fwhub.c
@@ -53,7 +53,7 @@ int probe_sst_fwhub(struct flashchip *flash)
return 0;
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
- flash->fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
+ fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (bios == MAP_FAILED) {
// it's this part but we can't map it ...
perror("Error MMAP /dev/mem");
diff --git a/util/flashrom/udelay.c b/util/flashrom/udelay.c
index 91c3c6dad5..1d0b42f039 100644
--- a/util/flashrom/udelay.c
+++ b/util/flashrom/udelay.c
@@ -18,7 +18,8 @@ void myusec_calibrate_delay()
struct timeval start, end;
int ok = 0;
- printf_debug("Setting up microsecond timing loop\n");
+ printf("Calibrating delay loop... ");
+
while (!ok) {
gettimeofday(&start, 0);
myusec_delay(count);
@@ -34,5 +35,6 @@ void myusec_calibrate_delay()
// compute one microsecond. That will be count / time
micro = count / timeusec;
- printf_debug("%ldM loops per second\n", (unsigned long)micro);
+ printf_debug("%ldM loops per second. ", (unsigned long)micro);
+ printf("ok\n");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 16:06:07 +0000