Remove duplicated code
Corresponding to flashrom svn r14 and coreboot v2 svn r1456.
diff --git a/sst49lf040.c b/sst49lf040.c
index 48ef440..03e0f5a 100644
--- a/sst49lf040.c
+++ b/sst49lf040.c
@@ -37,131 +37,6 @@
#define RESET 0xFF
#define READ_ID 0x90
-static int erase_sector_49lf040 (volatile char * bios, unsigned int page)
-{
- /* Chip erase function does not exist for LPC mode on 49lf040.
- * Erase sector-by-sector instead. */
- volatile unsigned char *Temp;
-
- /* Issue the Sector Erase command to 40LF040 */
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0xAA; /* write data 0xAA to the address */
- myusec_delay(10);
- Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */
- *Temp = 0x55; /* write data 0x55 to the address */
- myusec_delay(10);
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0x80; /* write data 0x80 to the address */
- myusec_delay(10);
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0xAA; /* write data 0xAA to the address */
- myusec_delay(10);
- Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */
- *Temp = 0x55; /* write data 0x55 to the address */
- myusec_delay(10);
- Temp = bios + page; /* set up address to be the current sector */
- *Temp = 0x30; /* write data 0x30 to the address */
-
- /* wait for Toggle bit ready */
- toggle_ready_jedec(bios);
-
- return(0);
-}
-
-static __inline__ int write_sector_49lf040(volatile char * bios,
- unsigned char * src,
- volatile unsigned char * dst,
- unsigned int page_size)
-{
- int i;
- volatile char *Temp;
-
- for (i = 0; i < page_size; i++) {
- if (*dst != 0xff) {
- printf("FATAL: dst %p not erased (val 0x%x)\n", dst, *dst);
- return(-1);
- }
- /* transfer data from source to destination */
- if (*src == 0xFF) {
- dst++, src++;
- /* If the data is 0xFF, don't program it */
- continue;
- }
- Temp = (bios + 0x5555);
- *Temp = 0xAA;
- Temp = bios + 0x2AAA;
- *Temp = 0x55;
- Temp = bios + 0x5555;
- *Temp = 0xA0;
- *dst = *src;
- toggle_ready_jedec(bios);
- if (*dst != *src)
- printf("BAD! dst 0x%lx val 0x%x src 0x%x\n",
- (unsigned long)dst, *dst, *src);
- dst++, src++;
- }
-
- return(0);
-}
-
-int probe_49lf040 (struct flashchip * flash)
-{
- volatile char * bios = flash->virt_addr;
- unsigned char id1, id2;
-
- *(volatile char *) (bios + 0x5555) = 0xAA;
- myusec_delay(10);
- *(volatile char *) (bios + 0x2AAA) = 0x55;
- myusec_delay(10);
- *(volatile char *) (bios + 0x5555) = 0x90;
- myusec_delay(10);
-
- id1 = *(volatile unsigned char *) bios;
- id2 = *(volatile unsigned char *) (bios + 0x01);
-
- *(volatile char *) (bios + 0x5555) = 0xAA;
- *(volatile char *) (bios + 0x2AAA) = 0x55;
- *(volatile char *) (bios + 0x5555) = 0xF0;
-
- myusec_delay(10);
-
- printf("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
-
- if (id1 == flash->manufacture_id && id2 == flash->model_id)
- return 1;
-
- return 0;
-}
-
-/* Chip erase only works in parallel programming mode for the 49lf040.
- * Use sector-erase instead */
-int erase_49lf040 (struct flashchip * flash)
-{
- volatile unsigned char * bios = flash->virt_addr;
- volatile unsigned char *Temp;
-
- /* Issue the Sector Erase command to 40LF040 */
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0xAA; /* write data 0xAA to the address */
- myusec_delay(10);
- Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */
- *Temp = 0x55; /* write data 0x55 to the address */
- myusec_delay(10);
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0x80; /* write data 0x80 to the address */
- myusec_delay(10);
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0xAA; /* write data 0xAA to the address */
- myusec_delay(10);
- Temp = bios + 0x2AAA; /* set up address to be C000:2AAAh */
- *Temp = 0x55; /* write data 0x55 to the address */
- myusec_delay(10);
- Temp = bios + 0x5555; /* set up address to be C000:5555h */
- *Temp = 0x10; /* write data 0x55 to the address */
- myusec_delay(50000);
-
- return(0);
-}
int write_49lf040 (struct flashchip * flash, unsigned char * buf)
{
@@ -171,13 +46,15 @@
printf ("Programming Page: ");
for (i = 0; i < total_size/page_size; i++) {
- /* erase the page before programming */
- erase_sector_49lf040(bios, i * page_size);
+ /* erase the page before programming
+ * Chip erase only works in parallel programming mode for the 49lf040.
+ * Use sector-erase instead */
+ erase_sector_jedec(bios, i * page_size);
/* write to the sector */
printf ("%04d at address: 0x%08x ", i, i * page_size);
- write_sector_49lf040(bios, buf + i * page_size, bios + i * page_size,
- page_size);
+ write_sector_jedec(bios, buf + i * page_size, bios + i * 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\b");
fflush(stdout);
}