Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c4c1776)
cross compile fix
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 21 Jul 2008 13:23:59 +0000 (13:23 +0000)
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Mon, 21 Jul 2008 13:23:59 +0000 (13:23 +0000)
git-svn-id: svn://svn.berlios.de/openocd/trunk@848 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/helper/Makefile.am patch | blob | history
src/helper/command.h patch | blob | history

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 630fbf50a92616e86d00b8e069b0672da19465fe..6e1af8fd9e97298bbe06582a0e0a43acac674af8 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -15,13 +15,14 @@ libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c comman
 noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
        time_support.h replacements.h fileio.h jim.h
 
 noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
        time_support.h replacements.h fileio.h jim.h
 
-noinst_PROGRAMS = bin2char
-
-bin2char_SOURCES = bin2char.c
 
 # Convert .tcl to cfile
 
 # Convert .tcl to cfile
-startup_tcl.c: startup.tcl bin2char$(EXEEXT)
-       ./bin2char$(EXEEXT) startup_tcl < $(srcdir)/$< > $@
+#
+# Fix!!! how do we make this more automake friendly?
+# 
+startup_tcl.c: startup.tcl
+       gcc -o bin2char $(srcdir)/bin2char.c 
+       ./bin2char startup_tcl < $(srcdir)/startup.tcl > $@
 
 # add startup_tcl.c to make clean list
 CLEANFILES = startup_tcl.c
 
 # add startup_tcl.c to make clean list
 CLEANFILES = startup_tcl.c
diff --git a/src/helper/command.h b/src/helper/command.h
index 0ef313ad5bc59c7eeba58497bcf88a75aad11dae..c8807dde3f41bfcca9859a42e6b6a2398d0ec637 100644 (file)
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -84,7 +84,7 @@ extern int fast_and_dangerous;
 
 /* Integrate the JIM TCL interpretor into the command processing. */
 #include <stdarg.h>
 
 /* Integrate the JIM TCL interpretor into the command processing. */
 #include <stdarg.h>
-#ifdef __ECOS
+#if BUILD_ECOSBOARD
 /* Jim is provied by eCos */
 #include <cyg/jimtcl/jim.h>
 #else
 /* Jim is provied by eCos */
 #include <cyg/jimtcl/jim.h>
 #else
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)