This patch aims to restructure SPI flash support in a more reasonable

[coreboot.git] / util / flashrom / sst49lf040.c

diff --git a/util/flashrom/sst49lf040.c b/util/flashrom/sst49lf040.c
index 36537f24de1270e853fee53fe803fd549684585c..e2d0e793c582a79e75d914b7310a54eac1f983eb 100644 (file)
--- a/util/flashrom/sst49lf040.c
+++ b/util/flashrom/sst49lf040.c
@@ -1,46 +1,39 @@
-/* sst49lf040.c: driver for SST49LF040 flash models.
+/*
+ * This file is part of the flashrom project.
  *
+ * Copyright (C) 2000 Silicon Integrated System Corporation
  *
- * Copyright 2000 Silicon Integrated System Corporation
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *      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
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- * Reference:
- *      4 MEgabit (512K x 8) SuperFlash EEPROM, SST49lF040 data sheet
- *
- * ToDo: Consilidated to standard JEDEC code.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+
 #include <stdio.h>
 #include "flash.h"
-#include "jedec.h"
-#include "sst49lf040.h"
 
 int erase_49lf040(struct flashchip *flash)
 {
-        int i;
-        int total_size = flash->total_size * 1024;
-        int page_size = flash->page_size;
-        volatile uint8_t *bios = flash->virt_addr;
+       int i;
+       int total_size = flash->total_size * 1024;
+       int page_size = flash->page_size;
+       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
                 * for the 49lf040. Use sector-erase instead */
                erase_sector_jedec(bios, i * page_size);
-       }         
+       }
+
        return 0;
 }
 
@@ -49,7 +42,7 @@ int write_49lf040(struct flashchip *flash, uint8_t *buf)
        int i;
        int total_size = flash->total_size * 1024;
        int page_size = flash->page_size;
-       volatile uint8_t *bios = flash->virt_addr;
+       volatile uint8_t *bios = flash->virtual_memory;
 
        printf("Programming Page: ");
        for (i = 0; i < total_size / page_size; i++) {
@@ -60,7 +53,7 @@ int write_49lf040(struct flashchip *flash, uint8_t *buf)
 
                /* write to the sector */
                printf("%04d at address: 0x%08x ", i, i * page_size);
-               
+
                write_sector_jedec(bios, buf + i * page_size,
                                   bios + i * page_size, page_size);
 
@@ -69,5 +62,5 @@ int write_49lf040(struct flashchip *flash, uint8_t *buf)
        }
        printf("\n");
 
-       return (0);
+       return 0;
 }