Change the SPI parts of flashrom to prepare for a merge of

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

diff --git a/util/flashrom/pm49fl004.c b/util/flashrom/pm49fl004.c
index 9995177d21f2a47372b81c49106745ad642ab064..e5fcd66675620fe4e4de2ae75a80b45529cbc75d 100644 (file)
--- a/util/flashrom/pm49fl004.c
+++ b/util/flashrom/pm49fl004.c
@@ -1,31 +1,25 @@
 /*
- * pm49fl004.c: driver for Pm49FL004 flash models.
+ * This file is part of the flashrom project.
  *
+ * Copyright (C) 2004 Tyan Corporation
  *
- * Copyright 2004 Tyan Corporation
- *     yhlu yhlu@tyan.com add exclude range
- *
- *     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.
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include <stdio.h>
 #include "flash.h"
-#include "jedec.h"
-#include "pm49fl004.h"
 
 extern int exclude_start_page, exclude_end_page;
 
@@ -34,9 +28,9 @@ int write_49fl004(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: ");
+       printf("Programming page: ");
        for (i = 0; i < total_size / page_size; i++) {
                if ((i >= exclude_start_page) && (i < exclude_end_page))
                        continue;
@@ -53,5 +47,5 @@ int write_49fl004(struct flashchip *flash, uint8_t *buf)
        }
        printf("\n");
 
-       return (0);
+       return 0;
 }