From 8d184b53c5257f794eea79a0c7cb52fa89d52139 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Wed, 14 May 2003 17:18:24 +0000 Subject: [PATCH] 2003-05-14 Marcel Telka * configure.ac (AC_CONFIG_FILES): Added src/flash/Makefile. * include/Makefile.am (noinst_HEADERS): Added flash.h. * src/Makefile.am (SUBDIRS): Added flash. (jtag_SOURCES): Removed flash.h, flash-intel.c, and flash-amd.c. (jtag_LDADD): Added libflash. * src/flash-amd.c: Moved this file ... * src/flash/amd.c: ... here. * src/flash-intel.c: Moved this file ... * src/flash/intel.c: ... here. * src/flash.h: Moved this file ... * include/flash.h: ...here. * src/flash/Makefile.am: New file. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@425 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 15 ++++++++++++ jtag/configure.ac | 1 + jtag/include/Makefile.am | 1 + jtag/{src => include}/flash.h | 0 jtag/src/Makefile.am | 8 +++---- jtag/src/flash/.cvsignore | 3 +++ jtag/src/flash/Makefile.am | 28 +++++++++++++++++++++++ jtag/src/{flash-amd.c => flash/amd.c} | 0 jtag/src/{flash-intel.c => flash/intel.c} | 0 9 files changed, 51 insertions(+), 5 deletions(-) rename jtag/{src => include}/flash.h (100%) create mode 100644 jtag/src/flash/.cvsignore create mode 100644 jtag/src/flash/Makefile.am rename jtag/src/{flash-amd.c => flash/amd.c} (100%) rename jtag/src/{flash-intel.c => flash/intel.c} (100%) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index 58223530..b357efa5 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,18 @@ +2003-05-14 Marcel Telka + + * configure.ac (AC_CONFIG_FILES): Added src/flash/Makefile. + * include/Makefile.am (noinst_HEADERS): Added flash.h. + * src/Makefile.am (SUBDIRS): Added flash. + (jtag_SOURCES): Removed flash.h, flash-intel.c, and flash-amd.c. + (jtag_LDADD): Added libflash. + * src/flash-amd.c: Moved this file ... + * src/flash/amd.c: ... here. + * src/flash-intel.c: Moved this file ... + * src/flash/intel.c: ... here. + * src/flash.h: Moved this file ... + * include/flash.h: ...here. + * src/flash/Makefile.am: New file. + 2003-05-13 Marcel Telka * src/jtag.c (jtag_parse_file): Added support for command scripts from stdin. diff --git a/jtag/configure.ac b/jtag/configure.ac index 757a281d..8546d626 100644 --- a/jtag/configure.ac +++ b/jtag/configure.ac @@ -41,6 +41,7 @@ AC_CONFIG_FILES( src/tap/Makefile src/part/Makefile src/bus/Makefile + src/flash/Makefile po/Makefile.in ) diff --git a/jtag/include/Makefile.am b/jtag/include/Makefile.am index 9861f234..599265df 100644 --- a/jtag/include/Makefile.am +++ b/jtag/include/Makefile.am @@ -27,6 +27,7 @@ noinst_HEADERS = \ cable.h \ chain.h \ data_register.h \ + flash.h \ gettext.h \ instruction.h \ parport.h \ diff --git a/jtag/src/flash.h b/jtag/include/flash.h similarity index 100% rename from jtag/src/flash.h rename to jtag/include/flash.h diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am index c70ae8c7..dc2b2a61 100644 --- a/jtag/src/Makefile.am +++ b/jtag/src/Makefile.am @@ -25,7 +25,8 @@ SUBDIRS = \ lib \ tap \ part \ - bus + bus \ + flash bin_PROGRAMS = \ jtag \ @@ -38,10 +39,7 @@ jtag_SOURCES = \ discovery.c \ readmem.c \ cfi.c \ - flash.h \ flash.c \ - flash-intel.c \ - flash-amd.c \ help.c bsdl2jtag_SOURCES = \ @@ -49,7 +47,7 @@ bsdl2jtag_SOURCES = \ jtag_DEPENDENCIES = lib/libjtaglib.a tap/libtap.a part/libpart.a bus/libbus.a -jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus @LIBINTL@ +jtag_LDADD = -Ltap -ltap -Lpart -lpart -Llib -ljtaglib -Lbus -lbus -Lflash -lflash @LIBINTL@ localedir = $(datadir)/locale INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\" diff --git a/jtag/src/flash/.cvsignore b/jtag/src/flash/.cvsignore new file mode 100644 index 00000000..e9955884 --- /dev/null +++ b/jtag/src/flash/.cvsignore @@ -0,0 +1,3 @@ +.deps +Makefile +Makefile.in diff --git a/jtag/src/flash/Makefile.am b/jtag/src/flash/Makefile.am new file mode 100644 index 00000000..827fb317 --- /dev/null +++ b/jtag/src/flash/Makefile.am @@ -0,0 +1,28 @@ +# +# $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 , 2003. +# + +noinst_LIBRARIES = libflash.a + +libflash_a_SOURCES = \ + amd.c \ + intel.c diff --git a/jtag/src/flash-amd.c b/jtag/src/flash/amd.c similarity index 100% rename from jtag/src/flash-amd.c rename to jtag/src/flash/amd.c diff --git a/jtag/src/flash-intel.c b/jtag/src/flash/intel.c similarity index 100% rename from jtag/src/flash-intel.c rename to jtag/src/flash/intel.c