Skip to content

Commit

Permalink
merge the last version from https://github.com/gnu-mcu-eclipse/openocd
Browse files Browse the repository at this point in the history 
Revision: 8721a12
Author: Liviu Ionescu
Date: 2017-09-03 00:57:08
[ilg-archived#16]; remove duplicate Makefile lines
  • Loading branch information
@besonzore
besonzore committed Oct 1, 2017
1 parent e4fff06 commit 23282d7
Show file tree
Hide file tree
Showing 451 changed files with 17,313 additions and 12,885 deletions.
131 changes: 50 additions & 81 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,85 @@
include $(top_srcdir)/common.mk
noinst_LTLIBRARIES += %D%/libopenocd.la
bin_PROGRAMS += %D%/openocd

SUBDIRS = \
jtag \
helper \
target \
transport \
flash \
svf \
xsvf \
pld \
server \
rtos
%C%_openocd_SOURCES = \
%D%/main.c

noinst_LTLIBRARIES = libopenocd.la
bin_PROGRAMS = openocd
%C%_libopenocd_la_SOURCES = \
%D%/hello.c %D%/hello.h \
%D%/openocd.c %D%/openocd.h

MAINFILE = main.c
%C%_openocd_LDADD = %D%/libopenocd.la

openocd_SOURCES = $(MAINFILE)
openocd_LDADD = libopenocd.la
%C%_openocd_LDADD += $(MINGWLDADD)

if INTERNAL_JIMTCL
openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
%C%_openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
else
openocd_LDADD += -ljim
%C%_openocd_LDADD += -ljim
endif

if ULINK
openocd_LDADD += -lm
endif

libopenocd_la_SOURCES = \
hello.c \
openocd.c

noinst_HEADERS = \
hello.h \
openocd.h

libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
%C%_libopenocd_la_CPPFLAGS =

# banner output includes RELSTR appended to $VERSION from the configure script
# guess-rev.sh returns either a repository version ID or "-snapshot"
if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
else
libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
endif

# add default CPPFLAGS
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
%C%_libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)

# the library search path.
libopenocd_la_LDFLAGS = $(all_libraries)
%C%_libopenocd_la_LDFLAGS = $(all_libraries)

if IS_MINGW
MINGWLDADD = -lws2_32
else
MINGWLDADD =
endif

libopenocd_la_LIBADD = \
$(top_builddir)/src/xsvf/libxsvf.la \
$(top_builddir)/src/svf/libsvf.la \
$(top_builddir)/src/pld/libpld.la \
$(top_builddir)/src/jtag/libjtag.la \
$(top_builddir)/src/transport/libtransport.la \
$(top_builddir)/src/flash/libflash.la \
$(top_builddir)/src/target/libtarget.la \
$(top_builddir)/src/server/libserver.la \
$(top_builddir)/src/rtos/librtos.la \
$(top_builddir)/src/helper/libhelper.la \
$(LIBFTDI_LIBS) $(MINGWLDADD) \
$(HIDAPI_LIBS) $(LIBUSB0_LIBS) $(LIBUSB1_LIBS)

STARTUP_TCL_SRCS = \
$(srcdir)/helper/startup.tcl \
$(srcdir)/jtag/startup.tcl \
$(srcdir)/target/startup.tcl \
$(srcdir)/flash/startup.tcl \
$(srcdir)/server/startup.tcl
%C%_libopenocd_la_LIBADD = \
%D%/xsvf/libxsvf.la \
%D%/svf/libsvf.la \
%D%/pld/libpld.la \
%D%/jtag/libjtag.la \
%D%/transport/libtransport.la \
%D%/flash/libflash.la \
%D%/target/libtarget.la \
%D%/server/libserver.la \
%D%/rtos/librtos.la \
%D%/helper/libhelper.la

EXTRA_DIST = $(STARTUP_TCL_SRCS)
BIN2C = $(srcdir)/%D%/helper/bin2char.sh

BUILT_SOURCES = startup_tcl.inc
STARTUP_TCL_SRCS =
EXTRA_DIST += $(STARTUP_TCL_SRCS)

startup.tcl: $(STARTUP_TCL_SRCS)
cat $^ > $@

BIN2C = $(top_srcdir)/src/helper/bin2char.sh
BUILT_SOURCES += %D%/startup_tcl.inc

# Convert .tcl to c-array
startup_tcl.inc: startup.tcl $(BIN2C)
$(BIN2C) < $< > $@ || { rm -f $@; false; }
%D%/startup_tcl.inc: $(STARTUP_TCL_SRCS)
cat $^ | $(BIN2C) > $@ || { rm -f $@; false; }

# add generated files to make clean list
CLEANFILES = startup.tcl startup_tcl.inc
CLEANFILES += %D%/startup_tcl.inc

# we do not want generated file in the dist
dist-hook:
rm -f $(distdir)/startup_tcl.inc

MAINTAINERCLEANFILES = $(srcdir)/Makefile.in

# The "quick" target builds executables & reinstalls the executables
# Primary use: developer types to quicken the edit/compile/debug
# cycle. by not requiring a "full build and full install". Note the
# assumption is: You are only rebuilding the EXE.... and everything
# else is/was previously installed.
#
# use at your own risk
quick: all install-binPROGRAMS

#dist-hook:
# rm -f $(distdir)/%D%/startup_tcl.inc

include %D%/helper/Makefile.am
include %D%/jtag/Makefile.am
include %D%/transport/Makefile.am
include %D%/xsvf/Makefile.am
include %D%/svf/Makefile.am
include %D%/target/Makefile.am
include %D%/rtos/Makefile.am
include %D%/server/Makefile.am
include %D%/flash/Makefile.am
include %D%/pld/Makefile.am
30 changes: 10 additions & 20 deletions src/flash/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
include $(top_srcdir)/common.mk
noinst_LTLIBRARIES += %D%/libflash.la
%C%_libflash_la_SOURCES = \
%D%/common.c %D%/common.h \
%D%/mflash.c %D%/mflash.h

SUBDIRS = \
nor \
nand
%C%_libflash_la_LIBADD = \
%D%/nor/libocdflashnor.la \
%D%/nand/libocdflashnand.la

METASOURCES = AUTO
noinst_LTLIBRARIES = libflash.la
libflash_la_SOURCES = \
common.c \
mflash.c
STARTUP_TCL_SRCS += %D%/startup.tcl

libflash_la_LIBADD = \
$(top_builddir)/src/flash/nor/libocdflashnor.la \
$(top_builddir)/src/flash/nand/libocdflashnand.la

noinst_HEADERS = \
common.h \
mflash.h

EXTRA_DIST = startup.tcl

MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
include %D%/nor/Makefile.am
include %D%/nand/Makefile.am
4 changes: 1 addition & 3 deletions src/flash/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/

#ifdef HAVE_CONFIG_H
Expand Down
11 changes: 5 additions & 6 deletions src/flash/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/

#ifndef FLASH_COMMON_H
#define FLASH_COMMON_H
#ifndef OPENOCD_FLASH_COMMON_H
#define OPENOCD_FLASH_COMMON_H

#include <helper/log.h>

Expand Down Expand Up @@ -46,5 +44,6 @@ bool flash_driver_name_matches(const char *name, const char *expected);
#define ERROR_FLASH_SECTOR_NOT_ERASED (-906)
#define ERROR_FLASH_BANK_NOT_PROBED (-907)
#define ERROR_FLASH_OPER_UNSUPPORTED (-908)
#define ERROR_FLASH_PROTECTED (-909)

#endif /* FLASH_COMMON_H */
#endif /* OPENOCD_FLASH_COMMON_H */
32 changes: 15 additions & 17 deletions src/flash/mflash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/

#ifdef HAVE_CONFIG_H
Expand Down Expand Up @@ -749,7 +747,7 @@ COMMAND_HANDLER(mg_write_cmd)
{
uint32_t address, cnt, res, i;
uint8_t *buffer;
struct fileio fileio;
struct fileio *fileio;
int ret;

if (CMD_ARGC != 3)
Expand All @@ -764,12 +762,12 @@ COMMAND_HANDLER(mg_write_cmd)
size_t filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
fileio_close(&fileio);
fileio_close(fileio);
return ERROR_FAIL;
}
int retval = fileio_size(&fileio, &filesize);
int retval = fileio_size(fileio, &filesize);
if (retval != ERROR_OK) {
fileio_close(&fileio);
fileio_close(fileio);
free(buffer);
return retval;
}
Expand All @@ -782,7 +780,7 @@ COMMAND_HANDLER(mg_write_cmd)

size_t buf_cnt;
for (i = 0; i < cnt; i++) {
ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
ret = fileio_read(fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
Expand All @@ -792,7 +790,7 @@ COMMAND_HANDLER(mg_write_cmd)
}

if (res) {
ret = fileio_read(&fileio, res, buffer, &buf_cnt);
ret = fileio_read(fileio, res, buffer, &buf_cnt);
if (ret != ERROR_OK)
goto mg_write_cmd_err;
ret = mg_mflash_write(address, buffer, res);
Expand All @@ -807,13 +805,13 @@ COMMAND_HANDLER(mg_write_cmd)
}

free(buffer);
fileio_close(&fileio);
fileio_close(fileio);

return ERROR_OK;

mg_write_cmd_err:
free(buffer);
fileio_close(&fileio);
fileio_close(fileio);

return ret;
}
Expand All @@ -822,7 +820,7 @@ COMMAND_HANDLER(mg_dump_cmd)
{
uint32_t address, size, cnt, res, i;
uint8_t *buffer;
struct fileio fileio;
struct fileio *fileio;
int ret;

if (CMD_ARGC != 4)
Expand All @@ -837,7 +835,7 @@ COMMAND_HANDLER(mg_dump_cmd)

buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
fileio_close(&fileio);
fileio_close(fileio);
return ERROR_FAIL;
}

Expand All @@ -852,7 +850,7 @@ COMMAND_HANDLER(mg_dump_cmd)
ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written);
ret = fileio_write(fileio, MG_FILEIO_CHUNK, buffer, &size_written);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
address += MG_FILEIO_CHUNK;
Expand All @@ -862,7 +860,7 @@ COMMAND_HANDLER(mg_dump_cmd)
ret = mg_mflash_read(address, buffer, res);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
ret = fileio_write(&fileio, res, buffer, &size_written);
ret = fileio_write(fileio, res, buffer, &size_written);
if (ret != ERROR_OK)
goto mg_dump_cmd_err;
}
Expand All @@ -875,13 +873,13 @@ COMMAND_HANDLER(mg_dump_cmd)
}

free(buffer);
fileio_close(&fileio);
fileio_close(fileio);

return ERROR_OK;

mg_dump_cmd_err:
free(buffer);
fileio_close(&fileio);
fileio_close(fileio);

return ret;
}
Expand Down
10 changes: 4 additions & 6 deletions src/flash/mflash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
* 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/

#ifndef _MFLASH_H
#define _MFLASH_H
#ifndef OPENOCD_FLASH_MFLASH_H
#define OPENOCD_FLASH_MFLASH_H

struct command_context;

Expand Down Expand Up @@ -288,4 +286,4 @@ typedef enum _mg_opmode {
mg_op_mode_stg = 0 /* Only Storage */
} mg_opmode;

#endif
#endif /* OPENOCD_FLASH_MFLASH_H */
Loading

0 comments on commit 23282d7

Please sign in to comment.