diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2004-03-18 20:31:54 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2004-03-18 20:31:54 +0000 |
| commit | 6f485e684956d0177b77cc58428a55a447793262 (patch) | |
| tree | 1483dd84aa7ee1e831ae5a4e6baef6af44986e01 | |
| parent | df273a58a3b6462242af05ec917b8096952ac9d4 (diff) | |
removed unused code in pm49fl004, remove experimental delay in sst49lf040
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1436 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | util/flash_and_burn/pm49fl004.c | 34 | ||||
| -rw-r--r-- | util/flash_and_burn/sst49lf040.c | 4 |
2 files changed, 1 insertions, 37 deletions
diff --git a/util/flash_and_burn/pm49fl004.c b/util/flash_and_burn/pm49fl004.c index 7fcb3ee72c..ce73be0e34 100644 --- a/util/flash_and_burn/pm49fl004.c +++ b/util/flash_and_burn/pm49fl004.c @@ -31,34 +31,6 @@ #define RESET 0xFF #define READ_ID 0x90 -static __inline__ void protect_49fl004 (volatile char * bios) -{ - /* ask compiler not to optimize this */ - volatile unsigned char tmp; - - tmp = *(volatile unsigned char *) (bios + 0x1823); - tmp = *(volatile unsigned char *) (bios + 0x1820); - tmp = *(volatile unsigned char *) (bios + 0x1822); - tmp = *(volatile unsigned char *) (bios + 0x0418); - tmp = *(volatile unsigned char *) (bios + 0x041B); - tmp = *(volatile unsigned char *) (bios + 0x0419); - tmp = *(volatile unsigned char *) (bios + 0x040A); -} - -static __inline__ void unprotect_49fl004 (volatile char * bios) -{ - /* ask compiler not to optimize this */ - volatile unsigned char tmp; - - tmp = *(volatile unsigned char *) (bios + 0x1823); - tmp = *(volatile unsigned char *) (bios + 0x1820); - tmp = *(volatile unsigned char *) (bios + 0x1822); - tmp = *(volatile unsigned char *) (bios + 0x0418); - tmp = *(volatile unsigned char *) (bios + 0x041B); - tmp = *(volatile unsigned char *) (bios + 0x0419); - tmp = *(volatile unsigned char *) (bios + 0x041A); -} - static __inline__ int erase_block_49fl004 ( volatile unsigned char * bios ,unsigned long address) { volatile unsigned char *Temp; @@ -188,8 +160,6 @@ int write_49fl004 (struct flashchip * flash, unsigned char * buf) int total_size = flash->total_size * 1024, page_size = flash->page_size; volatile char * bios = flash->virt_addr; -// unprotect_49fl004 (bios); -// erase_49fl004(flash); printf ("Programming Page: "); for (i = 0; i < total_size/page_size; i++) { /* erase the page before programming */ @@ -198,13 +168,11 @@ int write_49fl004 (struct flashchip * flash, unsigned char * buf) /* write to the sector */ printf ("%04d at address: 0x%08x", i, i * page_size); write_block_49fl004(bios, buf + i * page_size, bios + i * page_size, - page_size); + page_size); printf ("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); fflush(stdout); } printf("\n"); -// protect_49fl004 (bios); - return(0); } diff --git a/util/flash_and_burn/sst49lf040.c b/util/flash_and_burn/sst49lf040.c index 9f754857aa..48ef44084f 100644 --- a/util/flash_and_burn/sst49lf040.c +++ b/util/flash_and_burn/sst49lf040.c @@ -61,11 +61,9 @@ static int erase_sector_49lf040 (volatile char * bios, unsigned int page) myusec_delay(10); Temp = bios + page; /* set up address to be the current sector */ *Temp = 0x30; /* write data 0x30 to the address */ - myusec_delay(50000); /* wait for Toggle bit ready */ toggle_ready_jedec(bios); - myusec_delay(25000); return(0); } @@ -97,8 +95,6 @@ static __inline__ int write_sector_49lf040(volatile char * bios, *Temp = 0xA0; *dst = *src; toggle_ready_jedec(bios); - - data_polling_jedec(dst, *src); if (*dst != *src) printf("BAD! dst 0x%lx val 0x%x src 0x%x\n", (unsigned long)dst, *dst, *src); |