From 8abe4c57fa62d9e3211bd260741edce659218976 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Fri, 22 Aug 2008 12:51:48 +0000 Subject: [PATCH] - fix win32 build issues from previous jim patch git-svn-id: svn://svn.berlios.de/openocd/trunk@958 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- configure.in | 1 + src/helper/jim.c | 2 +- src/target/target/lm3s3748.cfg | 56 +++++++++++++++++----------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/configure.in b/configure.in index 007ac142..f3414f8c 100644 --- a/configure.in +++ b/configure.in @@ -20,6 +20,7 @@ AC_CHECK_FUNCS(strndup) AC_CHECK_FUNCS(strnlen) AC_CHECK_FUNCS(gettimeofday) AC_CHECK_FUNCS(usleep) +AC_CHECK_FUNCS(vasprintf) build_bitbang=no build_bitq=no diff --git a/src/helper/jim.c b/src/helper/jim.c index 02d0e0d1..ce7b8f62 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -12526,7 +12526,7 @@ int Jim_SetResult_sprintf( Jim_Interp *interp, const char *fmt,... ) { va_list ap; -#if 0 +#ifndef HAVE_VASPRINTF /* yucky way */ char buf[2048]; diff --git a/src/target/target/lm3s3748.cfg b/src/target/target/lm3s3748.cfg index 924c78a9..ff3d7158 100644 --- a/src/target/target/lm3s3748.cfg +++ b/src/target/target/lm3s3748.cfg @@ -1,28 +1,28 @@ -# Script for luminary lm3s3748 -# -# NB! work in progress! Duplicated from lm3s811.cfg, but does -# it need modification?? - -# RCLK -jtag_khz 500 - -jtag_nsrst_delay 100 -jtag_ntrst_delay 100 - -#lm3s3748 Evaluation Board has only srst -reset_config srst_only - -#jtag scan chain -#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) -jtag_device 4 0x1 0xf 0xe - -# the luminary variant causes a software reset rather than asserting SRST -# this stops the debug registers from being cleared -# this will be fixed in later revisions of silicon -target cortex_m3 little 0 lm3s - -# 8k working area at base of ram -working_area 0 0x20000000 0x2000 nobackup - -#flash configuration -flash bank stellaris 0 0 0 0 0 +# Script for luminary lm3s3748 +# +# NB! work in progress! Duplicated from lm3s811.cfg, but does +# it need modification?? + +# RCLK +jtag_khz 500 + +jtag_nsrst_delay 100 +jtag_ntrst_delay 100 + +#lm3s3748 Evaluation Board has only srst +reset_config srst_only + +#jtag scan chain +#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) +jtag_device 4 0x1 0xf 0xe + +# the luminary variant causes a software reset rather than asserting SRST +# this stops the debug registers from being cleared +# this will be fixed in later revisions of silicon +target cortex_m3 little 0 lm3s + +# 8k working area at base of ram +working_area 0 0x20000000 0x2000 nobackup + +#flash configuration +flash bank stellaris 0 0 0 0 0 -- 2.39.5