2003-06-10 Marcel Telka <marcel@telka.sk>

* include/Makefile.am (noinst_HEADERS): Removed cfi.h.
	* include/cfi.h: File removed.
	* src/flash.c: Updated include header files.


git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@480 b68d4a1b-bc3d-0410-92ed-d4ac073336b7

jtag/ChangeLog

@@ -1,3 +1,9 @@
+2003-06-10  Marcel Telka  <marcel@telka.sk>
+
+	* include/Makefile.am (noinst_HEADERS): Removed cfi.h.
+	* include/cfi.h: File removed.
+	* src/flash.c: Updated include header files.
+
 2003-06-10  Marcel Telka  <marcel@telka.sk>
 
 	* src/bus/sh7727.c (bus_params_t): Added md3 and md4.

jtag/include/Makefile.am

@@ -27,7 +27,6 @@ noinst_HEADERS = \
 	bsbit.h \
 	bus.h \
 	cable.h \
-	cfi.h \
 	chain.h \
 	data_register.h \
 	cmd.h \

jtag/include/cfi.h

@@ -1,30 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003 ETC s.r.o.
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by Marcel Telka <marcel@telka.sk>, 2003.
- *
- */
-
-#ifndef CFI_H
-#define CFI_H
-
-#include <brux/cfi.h>
-
-#endif /* CFI_H */

jtag/src/flash.c

@@ -37,12 +37,13 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <flash/cfi.h>
 #include <flash/intel.h>
+#include <brux/cfi.h>
 
 #include "bus.h"
 #include "flash.h"
-#include "cfi.h"
 #include "jtag.h"
 
 extern flash_driver_t amd_32_flash_driver;