Menu
▾
▴
[Openocd-svn] r1325 - in branches: . openocd-0.1 openocd-0.1/doc openocd-0.1/src openocd-0.1/src/flash openocd-0.1/src/helper openocd-0.1/src/jtag openocd-0.1/src/jtag/rlink openocd-0.1/src/server openocd-0.1/src/server/httpd openocd-0.1/src/server/httpd/menu_cuts openocd-0.1/src/target openocd-0.1/src/target/board openocd-0.1/src/target/interface openocd-0.1/src/target/target openocd-0.1/src/xsvf openocd-0.1/testing openocd-0.1/testing/build.test1 openocd-0.1/testing/build.test1/mingw32_help openocd-0.1/testing/build.test1/mingw32_help/include openocd-0.1/testing/build.test1/mingw32_help/include/sys openocd-0.1/testing/build.test2 openocd-0.1/testing/examples openocd-0.1/testing/examples/ledtest-imx27ads openocd-0.1/testing/examples/ledtest-imx31pdk openocd-0.1/tools openocd-0.1/tools/rlink_make_speed_table openocd-0.1/tools/st7_dtc_as openocd-0.1/tools/xsvf_tools
Author: kc8apf Date: 2009-01-16 07:43:11 +0100 (Fri, 16 Jan 2009) New Revision: 1325 Added: branches/openocd-0.1/ branches/openocd-0.1/src/flash/pic32mx.c branches/openocd-0.1/src/flash/pic32mx.h branches/openocd-0.1/src/helper/ioutil.c branches/openocd-0.1/src/jtag/rlink/ branches/openocd-0.1/src/jtag/rlink/Makefile branches/openocd-0.1/src/jtag/rlink/call.m4 branches/openocd-0.1/src/jtag/rlink/dtc_cmd.h branches/openocd-0.1/src/jtag/rlink/ep1_cmd.h branches/openocd-0.1/src/jtag/rlink/init.m4 branches/openocd-0.1/src/jtag/rlink/rlink.c branches/openocd-0.1/src/jtag/rlink/rlink.h branches/openocd-0.1/src/jtag/rlink/rlink_speed_table.c branches/openocd-0.1/src/jtag/rlink/st7.h branches/openocd-0.1/src/jtag/vsllink.c branches/openocd-0.1/src/server/httpd.c branches/openocd-0.1/src/server/httpd/ branches/openocd-0.1/src/server/httpd/Stylizer.class branches/openocd-0.1/src/server/httpd/Stylizer.java branches/openocd-0.1/src/server/httpd/browsemem.tcl branches/openocd-0.1/src/server/httpd/build.sh branches/openocd-0.1/src/server/httpd/downloadmem.tcl branches/openocd-0.1/src/server/httpd/editconfigs.tcl branches/openocd-0.1/src/server/httpd/editfile.tcl branches/openocd-0.1/src/server/httpd/erase.tcl branches/openocd-0.1/src/server/httpd/flash.tcl branches/openocd-0.1/src/server/httpd/flashinfo.tcl branches/openocd-0.1/src/server/httpd/guiupload.tcl branches/openocd-0.1/src/server/httpd/html2tcl.sh branches/openocd-0.1/src/server/httpd/httpd.tcl branches/openocd-0.1/src/server/httpd/index.tcl branches/openocd-0.1/src/server/httpd/log.tcl branches/openocd-0.1/src/server/httpd/menu.xml branches/openocd-0.1/src/server/httpd/menu.xsl branches/openocd-0.1/src/server/httpd/menu_cuts/ branches/openocd-0.1/src/server/httpd/menu_cuts/center_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/center_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab1.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab1_selected.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab2.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab2_selected.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab_free.png branches/openocd-0.1/src/server/httpd/menu_cuts/logo_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/logo_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_top_small.png branches/openocd-0.1/src/server/httpd/menu_cuts/top_right.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_1.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_2_tile.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_3.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_tab.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_tab_selected.png branches/openocd-0.1/src/server/httpd/menuweb.css branches/openocd-0.1/src/server/httpd/openocd.tcl branches/openocd-0.1/src/server/httpd/preconfig.tcl branches/openocd-0.1/src/server/httpd/production.tcl branches/openocd-0.1/src/server/httpd/readme.txt branches/openocd-0.1/src/server/httpd/reload.tcl branches/openocd-0.1/src/server/httpd/run.tcl branches/openocd-0.1/src/server/httpd/support.tcl branches/openocd-0.1/src/server/httpd/targets.tcl branches/openocd-0.1/src/server/httpd/terminal.tcl branches/openocd-0.1/src/server/httpd/upgrade.tcl branches/openocd-0.1/src/target/board/imx27ads.cfg branches/openocd-0.1/src/target/board/imx31pdk.cfg branches/openocd-0.1/src/target/board/pic-p32mx.cfg branches/openocd-0.1/src/target/board/x300t.cfg branches/openocd-0.1/src/target/interface/parport_dlc5.cfg branches/openocd-0.1/src/target/interface/rlink.cfg branches/openocd-0.1/src/target/target/samsung_s3c2440.cfg branches/openocd-0.1/src/target/target/smp8634.cfg branches/openocd-0.1/testing/build.test1/ branches/openocd-0.1/testing/build.test1/Makefile branches/openocd-0.1/testing/build.test1/Makefile.confuse branches/openocd-0.1/testing/build.test1/Makefile.ftd2xx branches/openocd-0.1/testing/build.test1/Makefile.libftdi branches/openocd-0.1/testing/build.test1/Makefile.libusb branches/openocd-0.1/testing/build.test1/Makefile.openocd branches/openocd-0.1/testing/build.test1/README.TXT branches/openocd-0.1/testing/build.test1/local.uses branches/openocd-0.1/testing/build.test1/mingw32_help/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/elf.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/cdefs.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf32.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf64.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf_common.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf_generic.h branches/openocd-0.1/testing/build.test2/ branches/openocd-0.1/testing/build.test2/Makefile branches/openocd-0.1/testing/build.test2/README.txt branches/openocd-0.1/testing/build.test2/local.uses branches/openocd-0.1/testing/examples/ledtest-imx27ads/ branches/openocd-0.1/testing/examples/ledtest-imx27ads/Makefile branches/openocd-0.1/testing/examples/ledtest-imx27ads/crt0.S branches/openocd-0.1/testing/examples/ledtest-imx27ads/gdbinit-imx27ads branches/openocd-0.1/testing/examples/ledtest-imx27ads/ldscript branches/openocd-0.1/testing/examples/ledtest-imx27ads/test.c branches/openocd-0.1/testing/examples/ledtest-imx27ads/test.elf branches/openocd-0.1/testing/examples/ledtest-imx31pdk/ branches/openocd-0.1/testing/examples/ledtest-imx31pdk/Makefile branches/openocd-0.1/testing/examples/ledtest-imx31pdk/crt0.S branches/openocd-0.1/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk branches/openocd-0.1/testing/examples/ledtest-imx31pdk/ldscript branches/openocd-0.1/testing/examples/ledtest-imx31pdk/test.c branches/openocd-0.1/testing/examples/ledtest-imx31pdk/test.elf branches/openocd-0.1/tools/ branches/openocd-0.1/tools/rlink_make_speed_table/ branches/openocd-0.1/tools/rlink_make_speed_table/rlink_make_speed_table branches/openocd-0.1/tools/rlink_make_speed_table/rlink_make_speed_table.pl branches/openocd-0.1/tools/st7_dtc_as/ branches/openocd-0.1/tools/st7_dtc_as/st7_dtc_as branches/openocd-0.1/tools/st7_dtc_as/st7_dtc_as.pl branches/openocd-0.1/tools/xsvf_tools/ branches/openocd-0.1/tools/xsvf_tools/svf2xsvf.py branches/openocd-0.1/tools/xsvf_tools/xsvfdump.py Removed: branches/openocd-0.1/src/jtag/rlink/Makefile branches/openocd-0.1/src/jtag/rlink/call.m4 branches/openocd-0.1/src/jtag/rlink/dtc_cmd.h branches/openocd-0.1/src/jtag/rlink/ep1_cmd.h branches/openocd-0.1/src/jtag/rlink/init.m4 branches/openocd-0.1/src/jtag/rlink/rlink.c branches/openocd-0.1/src/jtag/rlink/rlink.h branches/openocd-0.1/src/jtag/rlink/rlink_speed_table.c branches/openocd-0.1/src/jtag/rlink/st7.h branches/openocd-0.1/src/server/httpd/Stylizer.class branches/openocd-0.1/src/server/httpd/Stylizer.java branches/openocd-0.1/src/server/httpd/browsemem.tcl branches/openocd-0.1/src/server/httpd/build.sh branches/openocd-0.1/src/server/httpd/downloadmem.tcl branches/openocd-0.1/src/server/httpd/editconfigs.tcl branches/openocd-0.1/src/server/httpd/editfile.tcl branches/openocd-0.1/src/server/httpd/erase.tcl branches/openocd-0.1/src/server/httpd/flash.tcl branches/openocd-0.1/src/server/httpd/flashinfo.tcl branches/openocd-0.1/src/server/httpd/guiupload.tcl branches/openocd-0.1/src/server/httpd/html2tcl.sh branches/openocd-0.1/src/server/httpd/httpd.tcl branches/openocd-0.1/src/server/httpd/index.tcl branches/openocd-0.1/src/server/httpd/log.tcl branches/openocd-0.1/src/server/httpd/menu.xml branches/openocd-0.1/src/server/httpd/menu.xsl branches/openocd-0.1/src/server/httpd/menu_cuts/ branches/openocd-0.1/src/server/httpd/menu_cuts/center_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/center_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab1.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab1_selected.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab2.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab2_selected.png branches/openocd-0.1/src/server/httpd/menu_cuts/h_tab_free.png branches/openocd-0.1/src/server/httpd/menu_cuts/logo_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/logo_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_bottom.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_top.png branches/openocd-0.1/src/server/httpd/menu_cuts/right_top_small.png branches/openocd-0.1/src/server/httpd/menu_cuts/top_right.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_1.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_2_tile.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_3.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_tab.png branches/openocd-0.1/src/server/httpd/menu_cuts/v_tab_selected.png branches/openocd-0.1/src/server/httpd/menuweb.css branches/openocd-0.1/src/server/httpd/openocd.tcl branches/openocd-0.1/src/server/httpd/preconfig.tcl branches/openocd-0.1/src/server/httpd/production.tcl branches/openocd-0.1/src/server/httpd/readme.txt branches/openocd-0.1/src/server/httpd/reload.tcl branches/openocd-0.1/src/server/httpd/run.tcl branches/openocd-0.1/src/server/httpd/support.tcl branches/openocd-0.1/src/server/httpd/targets.tcl branches/openocd-0.1/src/server/httpd/terminal.tcl branches/openocd-0.1/src/server/httpd/upgrade.tcl branches/openocd-0.1/src/target/target/s3c2440.cfg branches/openocd-0.1/testing/build.test1/Makefile branches/openocd-0.1/testing/build.test1/Makefile.confuse branches/openocd-0.1/testing/build.test1/Makefile.ftd2xx branches/openocd-0.1/testing/build.test1/Makefile.libftdi branches/openocd-0.1/testing/build.test1/Makefile.libusb branches/openocd-0.1/testing/build.test1/Makefile.openocd branches/openocd-0.1/testing/build.test1/README.TXT branches/openocd-0.1/testing/build.test1/local.uses branches/openocd-0.1/testing/build.test1/mingw32_help/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/elf.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/ branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/cdefs.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf32.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf64.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf_common.h branches/openocd-0.1/testing/build.test1/mingw32_help/include/sys/elf_generic.h branches/openocd-0.1/testing/build.test2/Makefile branches/openocd-0.1/testing/build.test2/README.txt branches/openocd-0.1/testing/build.test2/local.uses branches/openocd-0.1/testing/examples/ledtest-imx27ads/Makefile branches/openocd-0.1/testing/examples/ledtest-imx27ads/crt0.S branches/openocd-0.1/testing/examples/ledtest-imx27ads/gdbinit-imx27ads branches/openocd-0.1/testing/examples/ledtest-imx27ads/ldscript branches/openocd-0.1/testing/examples/ledtest-imx27ads/test.c branches/openocd-0.1/testing/examples/ledtest-imx27ads/test.elf branches/openocd-0.1/testing/examples/ledtest-imx31pdk/Makefile branches/openocd-0.1/testing/examples/ledtest-imx31pdk/crt0.S branches/openocd-0.1/testing/examples/ledtest-imx31pdk/gdbinit-imx31pdk branches/openocd-0.1/testing/examples/ledtest-imx31pdk/ldscript branches/openocd-0.1/testing/examples/ledtest-imx31pdk/test.c branches/openocd-0.1/testing/examples/ledtest-imx31pdk/test.elf branches/openocd-0.1/tools/rlink_make_speed_table/ branches/openocd-0.1/tools/rlink_make_speed_table/rlink_make_speed_table branches/openocd-0.1/tools/rlink_make_speed_table/rlink_make_speed_table.pl branches/openocd-0.1/tools/st7_dtc_as/ branches/openocd-0.1/tools/st7_dtc_as/st7_dtc_as branches/openocd-0.1/tools/st7_dtc_as/st7_dtc_as.pl branches/openocd-0.1/tools/xsvf_tools/ branches/openocd-0.1/tools/xsvf_tools/svf2xsvf.py branches/openocd-0.1/tools/xsvf_tools/xsvfdump.py Modified: branches/openocd-0.1/configure.in branches/openocd-0.1/doc/openocd.1 branches/openocd-0.1/doc/openocd.texi branches/openocd-0.1/src/Makefile.am branches/openocd-0.1/src/ecosboard.c branches/openocd-0.1/src/flash/Makefile.am branches/openocd-0.1/src/flash/cfi.h branches/openocd-0.1/src/flash/ecos.c branches/openocd-0.1/src/flash/flash.c branches/openocd-0.1/src/flash/lpc2000.c branches/openocd-0.1/src/flash/lpc288x.c branches/openocd-0.1/src/flash/lpc3180_nand_controller.c branches/openocd-0.1/src/flash/mflash.c branches/openocd-0.1/src/flash/mflash.h branches/openocd-0.1/src/flash/nand.c branches/openocd-0.1/src/flash/s3c24xx_regs_nand.h branches/openocd-0.1/src/flash/stellaris.h branches/openocd-0.1/src/flash/stm32x.h branches/openocd-0.1/src/flash/str7x.c branches/openocd-0.1/src/flash/str7x.h branches/openocd-0.1/src/flash/str9x.h branches/openocd-0.1/src/flash/tms470.c branches/openocd-0.1/src/helper/Makefile.am branches/openocd-0.1/src/helper/bin2char.c branches/openocd-0.1/src/helper/binarybuffer.c branches/openocd-0.1/src/helper/command.c branches/openocd-0.1/src/helper/configuration.c branches/openocd-0.1/src/helper/fileio.h branches/openocd-0.1/src/helper/jim.c branches/openocd-0.1/src/helper/jim.h branches/openocd-0.1/src/helper/log.c branches/openocd-0.1/src/helper/log.h branches/openocd-0.1/src/helper/options.c branches/openocd-0.1/src/helper/replacements.c branches/openocd-0.1/src/helper/replacements.h branches/openocd-0.1/src/helper/tclapi.c branches/openocd-0.1/src/helper/types.h branches/openocd-0.1/src/jtag/Makefile.am branches/openocd-0.1/src/jtag/bitbang.c branches/openocd-0.1/src/jtag/bitq.c branches/openocd-0.1/src/jtag/dummy.c branches/openocd-0.1/src/jtag/ep93xx.c branches/openocd-0.1/src/jtag/ft2232.c branches/openocd-0.1/src/jtag/gw16012.c branches/openocd-0.1/src/jtag/jlink.c branches/openocd-0.1/src/jtag/jtag.c branches/openocd-0.1/src/jtag/jtag.h branches/openocd-0.1/src/jtag/presto.c branches/openocd-0.1/src/jtag/usbprog.c branches/openocd-0.1/src/jtag/zy1000.c branches/openocd-0.1/src/main.c branches/openocd-0.1/src/openocd.c branches/openocd-0.1/src/server/Makefile.am branches/openocd-0.1/src/server/gdb_server.c branches/openocd-0.1/src/server/server.c branches/openocd-0.1/src/server/server.h branches/openocd-0.1/src/server/tcl_server.c branches/openocd-0.1/src/server/telnet_server.c branches/openocd-0.1/src/target/arm720t.c branches/openocd-0.1/src/target/arm7_9_common.c branches/openocd-0.1/src/target/arm7_9_common.h branches/openocd-0.1/src/target/arm7tdmi.c branches/openocd-0.1/src/target/arm7tdmi.h branches/openocd-0.1/src/target/arm920t.c branches/openocd-0.1/src/target/arm926ejs.c branches/openocd-0.1/src/target/arm926ejs.h branches/openocd-0.1/src/target/arm966e.c branches/openocd-0.1/src/target/arm9tdmi.c branches/openocd-0.1/src/target/arm9tdmi.h branches/openocd-0.1/src/target/armv4_5.c branches/openocd-0.1/src/target/armv4_5.h branches/openocd-0.1/src/target/breakpoints.c branches/openocd-0.1/src/target/breakpoints.h branches/openocd-0.1/src/target/cortex_m3.c branches/openocd-0.1/src/target/cortex_m3.h branches/openocd-0.1/src/target/cortex_swjdp.h branches/openocd-0.1/src/target/embeddedice.h branches/openocd-0.1/src/target/etb.h branches/openocd-0.1/src/target/feroceon.c branches/openocd-0.1/src/target/image.c branches/openocd-0.1/src/target/image.h branches/openocd-0.1/src/target/mips32.c branches/openocd-0.1/src/target/mips32.h branches/openocd-0.1/src/target/mips32_dmaacc.c branches/openocd-0.1/src/target/mips32_dmaacc.h branches/openocd-0.1/src/target/mips32_pracc.c branches/openocd-0.1/src/target/mips32_pracc.h branches/openocd-0.1/src/target/mips_ejtag.c branches/openocd-0.1/src/target/mips_ejtag.h branches/openocd-0.1/src/target/mips_m4k.c branches/openocd-0.1/src/target/mips_m4k.h branches/openocd-0.1/src/target/oocd_trace.c branches/openocd-0.1/src/target/oocd_trace.h branches/openocd-0.1/src/target/register.c branches/openocd-0.1/src/target/register.h branches/openocd-0.1/src/target/target.c branches/openocd-0.1/src/target/target.h branches/openocd-0.1/src/target/target/imx31.cfg branches/openocd-0.1/src/target/target/pic32mx.cfg branches/openocd-0.1/src/target/target/str710.cfg branches/openocd-0.1/src/target/target/str730.cfg branches/openocd-0.1/src/target/target/str750.cfg branches/openocd-0.1/src/target/xscale.c branches/openocd-0.1/src/xsvf/xsvf.c Log: Sync 0.1.x branch with ToT Copied: branches/openocd-0.1 (from rev 1324, branches/openocd_1_0_branch) Modified: branches/openocd-0.1/configure.in =================================================================== --- branches/openocd_1_0_branch/configure.in 2009-01-15 20:58:17 UTC (rev 1324) +++ branches/openocd-0.1/configure.in 2009-01-16 06:43:11 UTC (rev 1325) @@ -28,9 +28,145 @@ is_mingw=no is_win32=no +# We are not *ALWAYS* being installed in the standard place. +# We may be installed in a "tool-build" specific location. +# Normally with other packages - as part of a tool distro. +# Thus - we should search that 'libdir' also. +# +# And - if we are being installed there - the odds are +# The libraries unique to what we are are there too. +# + +# Expand nd deal with NONE - just like configure will do later +OCDprefix=$prefix +OCDxprefix=$exec_prefix +test x"$OCDprefix" = xNONE && OCDprefix=$ac_default_prefix +# Let make expand exec_prefix. +test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix" + +# what matters is the "exec-prefix" +if test "$OCDxprefix" != "$ac_default_prefix" +then + # We are installing in a non-standard place + # Nonstandard --prefix and/or --exec-prefix + # We have an override of some sort. + # use build specific install library dir + + LDFLAGS="$LDFLAGS -L$OCDxprefix/lib" + # RPATH becomes an issue on Linux only + if test $host_os = linux-gnu || test $host_os = linux ; then + LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib" + fi + # The "INCDIR" is also usable + CFLAGS="$CFLAGS -I$includedir" +fi + +AC_ARG_WITH(ftd2xx, + AS_HELP_STRING([--with-ftd2xx=<PATH>],[This option has been removed.]), +[ +# Option Given. +cat << __EOF__ + +The option: --with-ftd2xx=<PATH> has been removed replaced. +On Linux, the new option is: + + --with-ftd2xx-linux-tardir=/path/to/files + +Where <path> is the path the the directory where the "tar.gz" file +from FTDICHIP.COM was unpacked, for example: + + --with-ftd2xx-linux-tardir=/home/duane/libftd2xx-linux-tardir=/home/duane/libftd2xx0.4.16 + +On Cygwin/MingW32, the new option is: + + --with-ftd2xx-win32-zipdir=/path/to/files + +Where <path> is the path to the directory where the "zip" file from +FTDICHIP.COM was unpacked, for example: + + --with-ftd2xx-win32-zipdir=/home/duane/ftd2xx.cdm.files + +__EOF__ + + AC_MSG_ERROR([Sorry Cannot continue]) +], +[ +# Option not given +true +] +) + +#======================================== +# FTD2XXX support comes in 3 forms. +# (1) win32 - via a zip file +# (2) linux - via a tar file +# (3) linux/cygwin/mingw - via libftdi +# +# In case (1) and (2) we need to know where the package was unpacked. + +AC_ARG_WITH(ftd2xx-win32-zipdir, + AS_HELP_STRING([--with-ftd2xx-win32-zipdir],[Where (CYGWIN/MINGW) the zip file from ftdichip.com was unpacked <default=search>]), + [ + # option present + if test -d $with_ftd2xx_win32_zipdir + then + with_ftd2xx_win32_zipdir=`cd $with_ftd2xx_win32_zipdir && pwd` + AC_MSG_NOTICE([Using: ftdichip.com library: $with_ftd2xx_win32_zipdir]) + else + AC_MSG_ERROR([Parameter to --with-ftd2xx-win32-zipdir is not a dir: $with_ftd2xx_win32_zipdir]) + fi + ], + [ + # not given + true + ] +) + +AC_ARG_WITH(ftd2xx-linux-tardir, + AS_HELP_STRING([--with-ftd2xx-linux-tardir], [Where (Linux/Unix) the tar file from ftdichip.com was unpacked <default=search>]), + [ + # Option present + if test $is_win32 = yes ; then + AC_MSG_ERROR([The option: --with-ftd2xx-linux-tardir is only usable on linux]) + fi + if test -d $with_ftd2xx_linux_tardir + then + with_ftd2xx_linux_tardir=`cd $with_ftd2xx_linux_tardir && pwd` + AC_MSG_NOTICE([Using: ftdichip.com library: $with_ftd2xx_linux_tardir]) + else + AC_MSG_ERROR([Parameter to --with-ftd2xx-linux-tardir is not a dir: $with_ftd2xx_linux_tardir]) + fi + ], + [ + # Not given + true + ] +) + +AC_ARG_WITH(ftd2xx-lib, + AS_HELP_STRING([--with-ftd2xx-lib], [Use static or shared ftd2xx libs on default static]), +[ +case "$withval" in +static) + with_ftd2xx_lib=$withval + ;; +shared) + with_ftd2xx_lib=$withval + ;; +*) + AC_MSG_ERROR([Option: --with-ftd2xx-lib=static or --with-ftd2xx-lib=shared not, $withval]) + ;; +esac +], +[ + # Default is static - it is simpler :-( + with_ftd2xx_lib=static +] +) + AC_ARG_ENABLE(gccwarnings, - AS_HELP_STRING([--enable-gccwarnings], [Enable compiler warnings, default no]), - [gcc_warnings=$enableval], [gcc_warnings=no]) + AS_HELP_STRING([--enable-gccwarnings], [Enable compiler warnings, default yes]), + [gcc_warnings=$enableval], [gcc_warnings=yes]) AC_ARG_ENABLE(parport, AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), @@ -52,11 +188,11 @@ esac AC_ARG_ENABLE(ft2232_libftdi, - AS_HELP_STRING([--enable-ft2232_libftdi], [Enable building support for FT2232 based devices using the libftdi driver]), + AS_HELP_STRING([--enable-ft2232_libftdi], [Enable building support for FT2232 based devices using the libftdi driver, opensource alternate of FTD2XX]), [build_ft2232_libftdi=$enableval], [build_ft2232_libftdi=no]) AC_ARG_ENABLE(ft2232_ftd2xx, - AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver]), + AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com]), [build_ft2232_ftd2xx=$enableval], [build_ft2232_ftd2xx=no]) AC_ARG_ENABLE(amtjtagaccel, @@ -67,6 +203,14 @@ AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCosBoard based JTAG debugger]), [build_ecosboard=$enableval], [build_ecosboard=no]) +AC_ARG_ENABLE(ioutil, + AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]), + [build_ioutil=$enableval], [build_ioutil=no]) + +AC_ARG_ENABLE(httpd, + AS_HELP_STRING([--enable-httpd], [Enable builtin httpd server - useful for standalone OpenOCD implementations]), + [build_httpd=$enableval], [build_httpd=no]) + case "${host_cpu}" in arm*) AC_ARG_ENABLE(ep93xx, @@ -108,12 +252,14 @@ AS_HELP_STRING([--enable-jlink], [Enable building support for the Segger J-Link JTAG Programmer]), [build_jlink=$enableval], [build_jlink=no]) -AC_ARG_WITH(ftd2xx, - [AS_HELP_STRING(--with-ftd2xx, - [Where libftd2xx can be found <default=search>])], - [], - with_ftd2xx=search) +AC_ARG_ENABLE(vsllink, + AS_HELP_STRING([--enable-vsllink], [Enable building support for the Versaloon-Link JTAG Programmer]), + [build_vsllink=$enableval], [build_vsllink=no]) +AC_ARG_ENABLE(rlink, + AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]), + [build_rlink=$enableval], [build_rlink=no]) + case $host in *-cygwin*) is_win32=yes @@ -164,7 +310,6 @@ AC_DEFINE(BUILD_DUMMY, 0, [0 if you don't want dummy driver.]) fi - if test $build_ep93xx = yes; then build_bitbang=yes AC_DEFINE(BUILD_EP93XX, 1, [1 if you want ep93xx.]) @@ -179,6 +324,18 @@ AC_DEFINE(BUILD_ECOSBOARD, 0, [0 if you don't want eCosBoard.]) fi +if test $build_ioutil = yes; then + AC_DEFINE(BUILD_IOUTIL, 1, [1 if you want ioutils.]) +else + AC_DEFINE(BUILD_IOUTIL, 0, [0 if you don't want ioutils.]) +fi + +if test $build_httpd = yes; then + AC_DEFINE(BUILD_HTTPD, 1, [1 if you want httpd.]) +else + AC_DEFINE(BUILD_HTTPD, 0, [0 if you don't want httpd.]) +fi + if test $build_at91rm9200 = yes; then build_bitbang=yes AC_DEFINE(BUILD_AT91RM9200, 1, [1 if you want at91rm9200.]) @@ -266,6 +423,207 @@ AC_DEFINE(BUILD_JLINK, 0, [0 if you don't want the J-Link JTAG driver.]) fi +if test $build_vsllink = yes; then + AC_DEFINE(BUILD_VSLLINK, 1, [1 if you want the Versaloon-Link JTAG driver.]) +else + AC_DEFINE(BUILD_VSLLINK, 0, [0 if you don't want the Versaloon-Link JTAG driver.]) +fi + +if test $build_rlink = yes; then + AC_DEFINE(BUILD_RLINK, 1, [1 if you want the RLink JTAG driver.]) +else + AC_DEFINE(BUILD_RLINK, 0, [0 if you don't want the RLink JTAG driver.]) +fi + +#-- Deal with MingW/Cygwin FTD2XX issues + +if test $is_win32 = yes; then +if test "${with_ftd2xx_linux_tardir+set}" = set +then + AC_MSG_ERROR([The option: with_ftd2xx_linux_tardir is for LINUX only.]) +fi + +if test $build_ft2232_ftd2xx = yes ; then +AC_MSG_CHECKING([for ftd2xx.lib exists (win32)]) + + # if we are given a zipdir... + if test "${with_ftd2xx_win32_zipdir+set}" = set + then + # Set the CFLAGS for "ftd2xx.h" + f=$with_ftd2xx_win32_zipdir/ftd2xx.h + if test ! -f $f ; then + AC_MSG_ERROR([File: $f cannot be found]) + fi + CFLAGS="$CFLAGS -I$with_ftd2xx_win32_zipdir" + + # And calculate the LDFLAGS for the machine + case "$host_cpu" in + i?86|x86_*) + LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386" + LIBS="$LIBS -lftd2xx" + f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib + ;; + amd64) + LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64" + LIBS="$LIBS -lftd2xx" + f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib + ;; + *) + AC_MSG_ERROR([Unknown Win32 host cpu: $host_cpu]) + ;; + esac + if test ! -f $f ; then + AC_MSG_ERROR([Library: $f not found]) + fi + else + LIBS="$LIBS -lftd2xx" + AC_MSG_WARN([ASSUMPTION: The (win32) FTDICHIP.COM files: ftd2xx.h and ftd2xx.lib are in a proper place]) + fi +fi +fi + +if test $is_win32 = no; then + +if test "${with_ftd2xx_win32_zipdir+set}" = set +then + AC_MSG_ERROR([The option: --with-ftd2xx-win32-zipdir is for win32 only]) +fi + +if test $build_ft2232_ftd2xx = yes ; then + AC_MSG_CHECKING([for libftd2xx.a (linux)]) + # Must be linux - + # Cause FTDICHIP does not supply a MAC-OS version + if test $host_os != linux-gnu && test $host_os != linux ; then + AC_MSG_ERROR([The (linux) ftd2xx library from FTDICHIP.com is linux only. Try --enable-ft2232-libftdi instead]) + fi + # Are we given a TAR directory? + if test "${with_ftd2xx_linux_tardir+set}" = set + then + # The .H file is simple.. + f=$with_ftd2xx_linux_tardir/ftd2xx.h + if test ! -f $f ; then + AC_MSG_ERROR([Option: --with-ftd2xx-linux-tardir appears wrong, cannot find: $f]) + fi + CFLAGS="$CFLAGS -I$with_ftd2xx_linux_tardir" + if test $with_ftd2xx_lib = shared + then + LDFLAGS="$LDFLAGS -L$with_ftd2xx_linux_tardir" + LIBS="$LIBS -lftd2xx" + AC_MSG_RESULT([ Assuming: -L$with_ftd2xx_linux_tardir -lftd2xx]) + else + # Test #1 - Future proof - if/when ftdichip fixes their distro. + # Try it with the simple ".a" suffix. + f=$with_ftd2xx_linux_tardir/static_lib/libftd2xx.a + if test -f $f ; then + # Yea we are done + LDFLAGS="$LDFLAGS -L$with_ftd2xx_linux_tardir/static_lib" + LIBS="$LIBS -lftd2xx" + else + # Test Number2. + # Grr.. perhaps it exists as a version number? + f="$with_ftd2xx_linux_tardir/static_lib/libftd2xx.a.*.*.*" + count=`ls $f | wc -l` + if test $count -gt 1 ; then + AC_MSG_ERROR([Multiple libftd2xx.a files found in: $with_ftd2xx_linux_tardir/static_lib sorry cannot handle this yet]) + fi + if test $count -ne 1 ; then + AC_MSG_ERROR([Not found: $f, option: --with-ftd2xx-linux-tardir appears to be wrong]) + fi + # Because the "-l" rules do not understand version numbers... + # we will just stuff the absolute path onto the LIBS variable + f=`ls $f` + # + LIBS="$LIBS $f -lpthread" + # No need to bother with LDFLAGS... + fi + AC_MSG_RESULT([Found: $f]) + fi + else + LIBS="$LIBS -lftd2xx" + AC_MSG_RESULT([Assumed: installed]) + AC_MSG_WARN([The (linux) FTDICHIP.COM files ftd2xx.h and libftd2xx.so are assumed to be in a proper place]) + fi +fi +fi + +if test $build_ft2232_ftd2xx = yes; then + +# Before we go any further - make sure we can *BUILD* and *RUN* +# a simple app with the "ftd2xx.lib" file - in what ever form we where given +# We should be able to compile, link and run this test program now + AC_MSG_CHECKING([Test: Build & Link with ftd2xx]) + +# +# Save the LDFLAGS for later.. +LDFLAGS_SAVE=$LDFLAGS +CFLAGS_SAVE=$CFLAGS +_LDFLAGS=`eval echo $LDFLAGS` +_CFLAGS=`eval echo $CFLAGS` +LDFLAGS=$_LDFLAGS +CFLAGS=$_CFLAGS + AC_RUN_IFELSE( +[ +#include "confdefs.h" +#if IS_WIN32 +#include "windows.h" +#endif +#include <stdio.h> +#include <ftd2xx.h> + +int +main( int argc, char **argv ) +{ + DWORD x; + FT_GetLibraryVersion( &x ); + return 0; +} +], [ AC_MSG_RESULT([Success!])] , [ AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib]) ] ) +LDFLAGS=$LDFLAGS_SAVE +CFLAGS=$CFLAGS_SAVE +fi + +if test $build_ft2232_libftdi = yes ; then + # We assume: the package is preinstalled in the proper place + # these present as 2 libraries.. + LIBS="$LIBS -lftdi -lusb" + # + # Try to build a small program. + AC_MSG_CHECKING([Build & Link with libftdi...]) + +LDFLAGS_SAVE=$LDFLAGS +CFLAGS_SAVE=$CFLAGS +_LDFLAGS=`eval echo $LDFLAGS` +_CFLAGS=`eval echo $CFLAGS` +LDFLAGS=$_LDFLAGS +CFLAGS=$_CFLAGS + + AC_RUN_IFELSE( +[ +#include <stdio.h> +#include <ftdi.h> + +int +main( int argc, char **argv ) +{ + struct ftdi_context *p; + p = ftdi_new(); + if( p != NULL ){ + return 0; + } else { + fprintf( stderr, "calling ftdi_new() failed\n"); + return 1; + } +} +] +, +[ AC_MSG_RESULT([Success]) ] +, +[ AC_MSG_ERROR([Cannot build & run test program using libftdi]) ] ) +# Restore the 'unexpanded ldflags' +LDFLAGS=$LDFLAGS_SAVE +CFLAGS=$CFLAGS_SAVE +fi + AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(openocd, 1.0) @@ -274,6 +632,8 @@ AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes) AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes) AM_CONDITIONAL(ECOSBOARD, test $build_ecosboard = yes) +AM_CONDITIONAL(IOUTIL, test $build_ioutil = yes) +AM_CONDITIONAL(HTTPD, test $build_httpd = yes) AM_CONDITIONAL(AT91RM9200, test $build_at91rm9200 = yes) AM_CONDITIONAL(BITBANG, test $build_bitbang = yes) AM_CONDITIONAL(FT2232_LIBFTDI, test $build_ft2232_libftdi = yes) @@ -285,10 +645,11 @@ AM_CONDITIONAL(USBPROG, test $build_usbprog = yes) AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes) AM_CONDITIONAL(JLINK, test $build_jlink = yes) +AM_CONDITIONAL(VSLLINK, test $build_vsllink = yes) +AM_CONDITIONAL(RLINK, test $build_rlink = yes) AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes) AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes) AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes) -AM_CONDITIONAL(FTD2XXDIR, test $with_ftd2xx != search) AM_CONDITIONAL(BITQ, test $build_bitq = yes) AC_LANG_C @@ -344,6 +705,4 @@ AC_MSG_RESULT([$EXEEXT_FOR_BUILD]) AC_SUBST(EXEEXT_FOR_BUILD) -AC_SUBST(WITH_FTD2XX, $with_ftd2xx) - AC_OUTPUT(Makefile src/Makefile src/helper/Makefile src/jtag/Makefile src/xsvf/Makefile src/target/Makefile src/server/Makefile src/flash/Makefile src/pld/Makefile doc/Makefile) Modified: branches/openocd-0.1/doc/openocd.1 =================================================================== --- branches/openocd_1_0_branch/doc/openocd.1 2009-01-15 20:58:17 UTC (rev 1324) +++ branches/openocd-0.1/doc/openocd.1 2009-01-16 06:43:11 UTC (rev 1325) @@ -1,37 +1,39 @@ -.TH "OPENOCD" "1" "February 29, 2008" +.TH "OPENOCD" "1" "January 08, 2009" .SH "NAME" openocd \- A free and open on\-chip debugging, in\-system programming and -boundary\-scan testing tool for ARM systems +boundary\-scan testing tool for ARM and MIPS systems .SH "SYNOPSIS" -.B openocd \fR[\fB\-fsdlchv\fR] [\fB\-\-file\fR <filename>] [\fB\-\-search\fR <dirname>] [\fB\-\-debug\fR <debuglevel>] [\fB\-\-log_output\fR <filename>] [\fB\-\-command\fR <cmd>] [\fB\-\-help\fR] [\fB\-\-version\fR] +.B openocd \fR[\fB\-fsdlcphv\fR] [\fB\-\-file\fR <filename>] [\fB\-\-search\fR <dirname>] [\fB\-\-debug\fR <debuglevel>] [\fB\-\-log_output\fR <filename>] [\fB\-\-command\fR <cmd>] [\fB\-\-pipe\fR] [\fB\-\-help\fR] [\fB\-\-version\fR] .SH "DESCRIPTION" .B OpenOCD is an on\-chip debugging, in\-system programming and boundary\-scan -testing tool for ARM systems. +testing tool for various ARM and MIPS systems. .PP The debugger uses an IEEE 1149\-1 compliant JTAG TAP bus master to access -on\-chip debug functionality available on ARM7/9, XScale, Cortex-M3, and -Marvell Feroceon (as found in the Orion SoC family) based -microcontrollers / system\-on\-chip solutions. +on\-chip debug functionality available on ARM based microcontrollers or +system-on-chip solutions. For MIPS systems the EJTAG interface is supported. .PP -User interaction is realized through a telnet command line interface and -a gdb (the GNU debugger) remote protocol server. +User interaction is realized through a telnet command line interface, +a gdb (the GNU debugger) remote protocol server, and a simplified RPC +connection that can be used to interface with OpenOCD's Jim Tcl engine. .PP OpenOCD supports various different types of JTAG interfaces/programmers, -please check the README for the complete list. +please check the \fIopenocd\fR info page for the complete list. .SH "OPTIONS" .TP .B "\-f, \-\-file <filename>" Use configuration file .BR <filename> . -If this option is omitted, the config file +In order to specify multiple config files, you can use multiple +.B \-\-file +arguments. If this option is omitted, the config file .B openocd.cfg in the current working directory will be used. .TP .B "\-s, \-\-search <dirname>" Search for config files and scripts in the directory .BR <dirname> . -If this option is omitted, openocd searches for config files and scripts +If this option is omitted, OpenOCD searches for config files and scripts in the current directory. .TP .B "\-d, \-\-debug <debuglevel>" @@ -58,6 +60,9 @@ Run the command .BR <cmd> . .TP +.B "\-p, \-\-pipe" +Use pipes when talking to gdb. +.TP .B "\-h, \-\-help" Show a help text and exit. .TP @@ -78,10 +83,12 @@ .B openocd is maintained as a Texinfo manual. If the .BR info +(or +.BR pinfo ) and .BR openocd programs are properly installed at your site, the command -.B info flex +.B info openocd should give you access to the complete manual. .PP Also, the OpenOCD wiki contains some more information and examples: Modified: branches/openocd-0.1/doc/openocd.texi =================================================================== --- branches/openocd_1_0_branch/doc/openocd.texi 2009-01-15 20:58:17 UTC (rev 1324) +++ branches/openocd-0.1/doc/openocd.texi 2009-01-16 06:43:11 UTC (rev 1325) @@ -15,7 +15,7 @@ @itemize @bullet @item Copyright @copyright{} 2008 The OpenOCD Project -@item Copyright @copyright{} 2007-2008 Spen @email{spen@@spen-soft.co.uk} +@item Copyright @copyright{} 2007-2008 Spencer Oliver @email{spen@@spen-soft.co.uk} @item Copyright @copyright{} 2008 Oyvind Harboe @email{oyvind.harboe@@zylin.com} @item Copyright @copyright{} 2008 Duane Ellis @email{openocd@@duaneellis.com} @end itemize @@ -96,8 +96,7 @@ @b{Dongles:} OpenOCD currently many types of hardware dongles: USB Based, Parallel Port Based, and other standalone boxes that run -OpenOCD internally. See the section titled: @xref{JTAG Hardware -Dongles}. +OpenOCD internally. See the section titled: @xref{JTAG Hardware Dongles}. @b{GDB Debug:} It allows ARM7 (ARM7TDMI and ARM720t), ARM9 (ARM920t, ARM922t, ARM926ej--s, ARM966e--s), XScale (PXA25x, IXP42x) and @@ -128,12 +127,54 @@ @chapter Building @cindex building OpenOCD +@section Pre-Built Tools If you are interested in getting actual work done rather than building OpenOCD, then check if your interface supplier provides binaries for you. Chances are that that binary is from some SVN version that is more stable than SVN trunk where bleeding edge development takes place. +@section Packagers Please Read! +If you are a @b{PACKAGER} of OpenOCD if you + +@enumerate +@item @b{Sell dongles} and include pre-built binaries +@item @b{Supply tools} ie: A complete development solution +@item @b{Supply IDEs} like Eclipse, or RHIDE, etc. +@item @b{Build packages} ie: RPM files, or DEB files for a Linux Distro +@end enumerate + +As a @b{PACKAGER} - you are at the top of the food chain. You solve +problems for downstream users. What you fix or solve - solves hundreds +if not thousands of user questions. If something does not work for you +please let us know. That said, would also like you to follow a few +suggestions: + +@enumerate +@item @b{Always build with Printer Ports Enabled} +@item @b{Try where possible to use LIBFTDI + LIBUSB} You cover more bases +@end enumerate + +It is your decision.. + +@itemize @bullet +@item @b{Why YES to LIBFTDI + LIBUSB} +@itemize @bullet +@item @b{LESS} work - libusb perhaps already there +@item @b{LESS} work - identical code multiple platforms +@item @b{MORE} dongles are supported +@item @b{MORE} platforms are supported +@item @b{MORE} complete solution +@end itemize +@item @b{Why not LIBFTDI + LIBUSB} (ie: ftd2xx instead) +@itemize @bullet +@item @b{LESS} Some say it is slower. +@item @b{LESS} complex to distribute (external dependencies) +@end itemize +@end itemize + +@section Building From Source + You can download the current SVN version with SVN client of your choice from the following repositories: @@ -167,8 +208,7 @@ homepage (@uref{www.amontec.com}), as the JTAGkey uses a non-standard VID/PID. @end itemize -libftdi is supported under windows. Versions earlier than 0.13 will require patching. -see contrib/libftdi for more details. +libftdi is supported under windows. Do not use versions earlier then 0.14. In general, the D2XX driver provides superior performance (several times as fast), but has the draw-back of being binary-only - though that isn't that bad, as it isn't @@ -180,36 +220,38 @@ @end example Bootstrap generates the configure script, and prepares building on your system. @example - ./configure + ./configure [options, see below] @end example Configure generates the Makefiles used to build OpenOCD. @example make + make install @end example -Make builds OpenOCD, and places the final executable in ./src/. +Make builds OpenOCD, and places the final executable in ./src/, the last step, ``make install'' is optional. The configure script takes several options, specifying which JTAG interfaces should be included: @itemize @bullet @item -@option{--enable-parport} +@option{--enable-parport} - Bit bang pc printer ports. @item -@option{--enable-parport_ppdev} +@option{--enable-parport_ppdev} - Parallel Port [see below] @item -@option{--enable-parport_giveio} +@option{--enable-parport_giveio} - Parallel Port [see below] @item -@option{--enable-amtjtagaccel} +@option{--enable-amtjtagaccel} - Parallel Port [Amontec, see below] @item -@option{--enable-ft2232_ftd2xx} -@footnote{Using the latest D2XX drivers from FTDI and following their installation -instructions, I had to use @option{--enable-ft2232_libftd2xx} for OpenOCD to -build properly.} +@option{--enable-ft2232_ftd2xx} - Numerous USB Type ARM JTAG dongles use the FT2232C chip from this FTDICHIP.COM chip (closed source). @item -@option{--enable-ft2232_libftdi} +@option{--enable-ft2232_libftdi} - An open source (free) alternate to FTDICHIP.COM ftd2xx solution (Linux, MacOS, Cygwin) @item -@option{--with-ftd2xx=/path/to/d2xx/} +@option{--with-ftd2xx-win32-zipdir=PATH} - If using FTDICHIP.COM ft2232c, point at the directory where the Win32 FTDICHIP.COM 'CDM' driver zip file was unpacked. @item +@option{--with-ftd2xx-linux-tardir=PATH} - Linux only equal of @option{--with-ftd2xx-win32-zipdir}, where you unpacked the TAR.GZ file. +@item +@option{--with-ftd2xx-lib=shared|static} - Linux only. Default: static, specifies how the FTDICHIP.COM libftd2xx driver should be linked. Note 'static' only works in conjunction with @option{--with-ftd2xx-linux-tardir}. Shared is supported (12/26/2008), however you must manually install the required header files and shared libraries in an appropriate place. This uses ``libusb'' internally. +@item @option{--enable-gw16012} @item @option{--enable-usbprog} @@ -218,22 +260,75 @@ @item @option{--enable-presto_ftd2xx} @item -@option{--enable-jlink} +@option{--enable-jlink} - From SEGGER +@item +@option{--enable-vsllink} +@item +@option{--enable-rlink} - Raisonance.com dongle. @end itemize +@section Parallel Port Dongles + If you want to access the parallel port using the PPDEV interface you have to specify both the @option{--enable-parport} AND the @option{--enable-parport_ppdev} option since the @option{--enable-parport_ppdev} option actually is an option to the parport driver (see @uref{http://forum.sparkfun.com/viewtopic.php?t=3795} for more info). -Cygwin users have to specify the location of the FTDI D2XX package. This should be an -absolute path containing no spaces. +@section FT2232C Based USB Dongles -Linux users should copy the various parts of the D2XX package to the appropriate -locations, i.e. /usr/include, /usr/lib. +There are 2 methods of using the FTD2232, either (1) using the +FTDICHIP.COM closed source driver, or (2) the open (and free) driver +libftdi. Some claim the (closed) FTDICHIP.COM solution is faster. -Miscellaneous configure options +The FTDICHIP drivers come as either a (win32) ZIP file, or a (linux) +TAR.GZ file. You must unpack them ``some where'' convient. As of this +writing (12/26/2008) FTDICHIP does not supply means to install these +files ``in an appropriate place'' As a result, there are two +``./configure'' options that help. +Below is an example build process: + +1) Check out the latest version of ``openocd'' from SVN. + +2) Download & Unpack either the Windows or Linux FTD2xx Drivers + (@uref{http://www.ftdichip.com/Drivers/D2XX.htm}) + +@example + /home/duane/ftd2xx.win32 => the Cygwin/Win32 ZIP file contents. + /home/duane/libftd2xx0.4.16 => the Linux TAR file contents. +@end example + +3) Configure with these options: + +@example +Cygwin FTCICHIP solution + ./configure --prefix=/home/duane/mytools \ + --enable-ft2232_ftd2xx \ + --with-ftd2xx-win32-zipdir=/home/duane/ftd2xx.win32 + +Linux FTDICHIP solution + ./configure --prefix=/home/duane/mytools \ + --enable-ft2232_ftd2xx \ + --with-ft2xx-linux-tardir=/home/duane/libftd2xx0.4.16 + +Cygwin/Linux LIBFTDI solution + Assumes: + 1a) For Windows: The windows port of LIBUSB is in place. + 1b) For Linux: libusb has been built and is inplace. + + 2) And libftdi has been built and installed + Note: libftdi - relies upon libusb. + + ./configure --prefix=/home/duane/mytools \ + --enable-ft2232_libftdi + +@end example + +4) Then just type ``make'', and perhaps ``make install''. + + +@section Miscellaneous configure options + @itemize @bullet @item @option{--enable-gccwarnings} - enable extra gcc warnings during build @@ -323,6 +418,18 @@ @* Link: @url{http://www.iar.com/website1/1.0.1.0/369/1/index.php} @end itemize +@section USB RLINK based +Raisonance has an adapter called @b{RLink}. It exists in a stripped-down form on the STM32 Primer, permanently attached to the JTAG lines. It also exists on the STM32 Primer2, but that is wired for SWD and not JTAG, thus not supported. + +@itemize @bullet +@item @b{Raisonance RLink} +@* Link: @url{http://www.raisonance.com/products/RLink.php} +@item @b{STM32 Primer} +@* Link: @url{http://www.stm32circle.com/resources/stm32primer.php} +@item @b{STM32 Primer2} +@* Link: @url{http://www.stm32circle.com/resources/stm32primer2.php} +@end itemize + @section USB Other @itemize @bullet @item @b{USBprog} @@ -330,6 +437,9 @@ @item @b{USB - Presto} @* Link: @url{http://tools.asix.net/prg_presto.htm} + +@item @b{Versaloon-Link} +@* Link: @url{http://www.simonqian.com/en/Versaloon} @end itemize @section IBM PC Parallel Printer Port Based @@ -411,9 +521,10 @@ --debug | -d set debug level <0-3> --log_output | -l redirect log output to file <name> --command | -c run <command> +--pipe | -p use pipes when talking to gdb @end verbatim -By default openocd reads the file configuration file ``openocd.cfg'' +By default OpenOCD reads the file configuration file ``openocd.cfg'' in the current directory. To specify a different (or multiple) configuration file, you can use the ``-f'' option. For example: @@ -445,6 +556,8 @@ the @option{-s <search>} switch. The current directory and the OpenOCD target library is in the search path by default. +For details on the @option{-p} option. @xref{Connecting to GDB}. + Note! OpenOCD will launch the GDB & telnet server even if it can not establish a connection with the target. In general, it is possible for the JTAG controller to be unresponsive until the target is set up @@ -455,7 +568,7 @@ @cindex configuration @section Outline -There are 4 basic ways of ``configurating'' openocd to run, they are: +There are 4 basic ways of ``configurating'' OpenOCD to run, they are: @enumerate @item A small openocd.cfg file which ``sources'' other configuration files @@ -541,7 +654,7 @@ @enumerate @item The RESET configuration of your debug environment as a hole -@item Is there a ``work area'' that that OpenOCD can use? +@item Is there a ``work area'' that OpenOCD can use? @* For ARM - work areas mean up to 10x faster downloads. @item For MMU/MPU based ARM chips (ie: ARM9 and later) will that work area still be available? @item For complex targets (multiple chips) the JTAG SPEED becomes an issue. @@ -671,7 +784,7 @@ every chip. If the @t{-expected-id} is nonzero, OpenOCD attempts to verify the tap id number verses configuration file and may issue an error or warning like this. The hope is this will help pin point -problem openocd configurations. +problem OpenOCD configurations. @example Info: JTAG tap: sam7x256.cpu tap/device found: 0x3f0f0f0f (Manufacturer: 0x787, Part: 0xf0f0, Version: 0x3) @@ -904,7 +1017,7 @@ JIM-Tcl commands, and (older) the orginal command interpretor. @item @b{Commands} -@* At the openocd telnet command line (or via the GDB mon command) one +@* At the OpenOCD telnet command line (or via the GDB mon command) one can type a Tcl for() loop, set variables, etc. @item @b{Historical Note} @@ -917,7 +1030,7 @@ @node Daemon Configuration @chapter Daemon Configuration -The commands here are commonly found inthe openocd.cfg file and are +The commands here are commonly found in the openocd.cfg file and are used to specify what TCP/IP ports are used, and how GDB should be supported. @section init @@ -1014,6 +1127,11 @@ # jlink interface interface jlink @end verbatim +@b{A Raisonance RLink} +@verbatim +# rlink interface +interface rlink +@end verbatim @b{Parallel Port} @verbatim interface parport @@ -1063,6 +1181,12 @@ @item @b{jlink} @* Segger jlink usb adapter + +@item @b{rlink} +@* Raisonance RLink usb adapter + +@item @b{vsllink} +@* vsllink is part of Versaloon which is a versatile USB programmer. @comment - End parameters @end itemize @comment - End Interface @@ -1145,7 +1269,7 @@ @b{TODO:} Confirm the following: On windows the name needs to end with a ``space A''? Or not? It has to do with the FTD2xx driver. When must this be added and when must it not be added? Why can't the code in the -interface or in openocd automatically add this if needed? -- Duane. +interface or in OpenOCD automatically add this if needed? -- Duane. @item @b{ft2232_serial} <@var{serial-number}> @cindex ft2232_serial @@ -1244,6 +1368,7 @@ @item ft2232: 6MHz / (@var{number}+1) @item amt jtagaccel: 8 / 2**@var{number} @item jlink: maximum speed in kHz (0-12000), 0 will use RTCK +@item rlink: 24MHz / @var{number}, but only for certain values of @var{number} @comment end speed list. @end itemize @@ -1381,7 +1506,7 @@ @itemize @bullet @item @b{-irlen NUMBER} - the length in bits of the instruction register @item @b{-ircapture NUMBER} - the ID code capture command. -@item @b{-irmask NUMBER} - the corrisponding mask for the ir register. +@item @b{-irmask NUMBER} - the corresponding mask for the ir register. @comment END REQUIRED @end itemize An example of a FOOBAR Tap @@ -1392,8 +1517,6 @@ bits long, during Capture-IR 0x42 is loaded into the IR, and bits [6,4,2,0] are checked. -FIXME: The IDCODE - this was not used in the old code, it should be? -Right? -Duane. @item @b{Optional configparams} @comment START Optional @itemize @bullet @@ -1488,13 +1611,13 @@ @* @b{Removed: 28/nov/2008} This command has been removed and replaced by the ``jtag newtap'' command. The documentation remains here so that one can easily convert the old syntax to the new syntax. About the old -syntax: The old syntax is positional, ie: The 4th parameter is the -``irmask'' The new syntax requires named prefixes, and supports -additional options, for example ``-irmask 4'' Please refer to the -@b{jtag newtap} command for deails. +syntax: The old syntax is positional, ie: The 3rd parameter is the +``irmask''. The new syntax requires named prefixes, and supports +additional options, for example ``-expected-id 0x3f0f0f0f''. Please refer to the +@b{jtag newtap} command for details. @example -OLD: jtag_device 8 0x01 0x0e3 0xfe -NEW: jtag newtap CHIPNAME TAPNAME -irlen 8 -ircapture 0xe3 -irmask 0xfe +OLD: jtag_device 8 0x01 0xe3 0xfe +NEW: jtag newtap CHIPNAME TAPNAME -irlen 8 -ircapture 0x01 -irmask 0xe3 @end example @section Enable/Disable Taps @@ -1527,7 +1650,7 @@ circuit and skipped. -From OpenOCDs view point, a JTAG TAP is in one of 3 states: +From OpenOCD's view point, a JTAG TAP is in one of 3 states: @itemize @bullet @item @b{Enabled - Not In ByPass} and has a variable bit length @@ -1540,7 +1663,7 @@ @b{jtag tapisenabled DOTTED.NAME} -This command return 1 if the named tap is currently enabled, 0 if not. +This command returns 1 if the named tap is currently enabled, 0 if not. This command exists so that scripts that manipulate a JRC (like the Omap3530 has) can determine if OpenOCD thinks a tap is presently enabled, or disabled. @@ -1555,7 +1678,7 @@ @section targets [NAME] @b{Note:} This command name is PLURAL - not singular. -With NO parameter, this pural @b{targets} command lists all known +With NO parameter, this plural @b{targets} command lists all known targets in a human friendly form. With a parameter, this pural @b{targets} command sets the current @@ -1640,7 +1763,7 @@ puts [format "The button is %s" $x] @end example -In OpenOCDs terms, the ``target'' is an object just like a Tcl/Tk +In OpenOCD's terms, the ``target'' is an object just like a Tcl/Tk button. Commands avaialble as a ``target object'' are: @comment START targetobj commands. @@ -1687,13 +1810,13 @@ @end itemize @section Target Events -At various times, certian things happen, or you want to happen. +At various times, certain things can happen, or you want them to happen. Examples: @itemize @bullet @item What should happen when GDB connects? Should your target reset? @item When GDB tries to flash the target, do you need to enable the flash via a special command? -@item During reset, do you need to write to certian memory locations to reconfigure the SDRAM? +@item During reset, do you need to write to certain memory location to reconfigure the SDRAM? @end itemize All of the above items are handled by target events. @@ -1705,7 +1828,7 @@ target event name, and BODY is a tcl procedure or string of commands to execute. -The programers model is the: ``-command'' option used in Tcl/Tk +The programmers model is the ``-command'' option used in Tcl/Tk buttons and events. Below are two identical examples, the first creates and invokes small procedure. The second inlines the procedure. @@ -1718,8 +1841,8 @@ mychip.cpu configure -event gdb-attach @{ puts "Reset..." ; reset halt @} @end example -Current Events - +@section Current Events +The following events are available: @itemize @bullet @item @b{debug-halted} @* The target has halted for debug reasons (ie: breakpoint) @@ -1783,6 +1906,22 @@ @* Success @item @b{resumed} @* Target has resumed +@item @b{tap-enable} +@* Executed by @b{jtag tapenable DOTTED.NAME} command. Example: +@example +jtag configure DOTTED.NAME -event tap-enable @{ + puts "Enabling CPU" + ... +@} +@end example +@item @b{tap-disable} +@*Executed by @b{jtag tapdisable DOTTED.NAME} command. Example: +@example +jtag configure DOTTED.NAME -event tap-disable @{ + puts "Disabling CPU" + ... +@} +@end example @end itemize @@ -1819,13 +1958,13 @@ @comment end TYPES @end itemize @item @b{PARAMS} -@*PARAMs are various target configure parameters, the following are manditory -at configuration. -@comment START manditory +@*PARAMs are various target configure parameters, the following are mandatory +at configuration: +@comment START mandatory @itemize @bullet @item @b{-endian big|little} @item @b{-chain-position DOTTED.NAME} -@comment end MANDITORY +@comment end MANDATORY @end itemize @comment END params @end itemize @@ -1841,7 +1980,7 @@ @item @b{-work-area-size [ADDRESS]} specify/set the work area @item @b{-work-area-backup [0|1]} does the work area get backed up @item @b{-endian [big|little]} -@item @b{-variant [NAME]} some chips have varients openocd needs to know about +@item @b{-variant [NAME]} some chips have varients OpenOCD needs to know about @item @b{-chain-position DOTTED.NAME} the tap name this target refers to. @end itemize Example: @@ -1870,7 +2009,7 @@ @* None (this is also used as the ARM946) @item @b{cortex_m3} @* use variant <@var{-variant lm3s}> when debugging luminary lm3s targets. This will cause -openocd to use a software reset rather than asserting SRST to avoid a issue with clearing +OpenOCD to use a software reset rather than asserting SRST to avoid a issue with clearing the debug registers. This is fixed in Fury Rev B, DustDevil Rev B, Tempest, these revisions will be detected and the normal reset behaviour used. @item @b{xscale} @@ -1880,9 +2019,9 @@ @item @b{mips_m4k} @* Use variant @option{ejtag_srst} when debugging targets that do not provide a functional SRST line on the EJTAG connector. This causes -openocd to instead use an EJTAG software reset command to reset the +OpenOCD to instead use an EJTAG software reset command to reset the processor. You still need to enable @option{srst} on the reset -configuration command to enable openocd hardware reset functionality. +configuration command to enable OpenOCD hardware reset functionality. @comment END varients @end itemize @section working_area - Command Removed @@ -2004,7 +2143,7 @@ @end itemize @section flash bank command -The @b{flash bank} command is used to configure one or more flash chips (or banks in openocd terms) +The @b{flash bank} command is used to configure one or more flash chips (or banks in OpenOCD terms) @example @b{flash bank} <@var{driver}> <@var{base}> <@var{size}> <@var{chip_width}> @@ -2170,7 +2309,7 @@ @end itemize Note: Before using the str9xpec driver here is some background info to help -you better understand how the drivers works. Openocd has two flash drivers for +you better understand how the drivers works. OpenOCD has two flash drivers for the str9. @enumerate @item @@ -2305,14 +2444,12 @@ @section Daemon Commands -@subsection sleep -@b{sleep} <@var{msec}> +@subsection sleep [@var{msec}] @cindex sleep @*Wait for n milliseconds before resuming. Useful in connection with script files (@var{script} command and @var{target_script} configuration). -@subsection sleep -@b{shutdown} +@subsection shutdown @cindex shutdown @*Close the OpenOCD daemon, disconnecting all clients (GDB, Telnet, Other). @@ -2709,7 +2846,8 @@ example if you need to control a JTAG Route Controller (ie: the OMAP3530 on the Beagle Board has one) you might use these commands in a script or an event procedure. - +@section Commands +@cindex Commands @itemize @bullet @item @b{scan_chain} @cindex scan_chain @@ -2743,7 +2881,45 @@ Display/modify variable field <@var{var}> <@var{field}> [@var{value}|@var{flip}]. @end itemize +@section Tap states +@cindex Tap states +Available tap_states are: +@itemize @bullet +@item @b{RESET} +@cindex RESET +@item @b{IDLE} +@cindex IDLE +@item @b{DRSELECT} +@cindex DRSELECT +@item @b{DRCAPTURE} +@cindex DRCAPTURE +@item @b{DRSHIFT} +@cindex DRSHIFT +@item @b{DREXIT1} +@cindex DREXIT1 +@item @b{DRPAUSE} +@cindex DRPAUSE +@item @b{DREXIT2} +@cindex DREXIT2 +@item @b{DRUPDATE} +@cindex DRUPDATE +@item @b{IRSELECT} +@cindex IRSELECT +@item @b{IRCAPTURE} +@cindex IRCAPTURE +@item @b{IRSHIFT} +@cindex IRSHIFT +@item @b{IREXIT1} +@cindex IREXIT1 +@item @b{IRPAUSE} +@cindex IRPAUSE +@item @b{IREXIT2} +@cindex IREXIT2 +@item @b{IRUPDATE} +@cindex IRUPDATE +@end itemize + @node TFTP @chapter TFTP @cindex TFTP @@ -2793,41 +2969,53 @@ OpenOCD complies with the remote gdbserver protocol, and as such can be used to debug remote targets. -@section Connecting to gdb -@cindex Connecting to gdb +@section Connecting to GDB +@cindex Connecting to GDB +@anchor{Connecting to GDB} Use GDB 6.7 or newer with OpenOCD if you run into trouble. For instance 6.3 has a known bug where it produces bogus memory access errors, which has since been fixed: look up 1836 in @url{http://sourceware.org/cgi-bin/gnatsweb.pl?database=gdb} - -A connection is typically started as follows: +@*OpenOCD can communicate with GDB in two ways: +@enumerate +@item +A socket (tcp) connection is typically started as follows: @example target remote localhost:3333 @end example -This would cause gdb to connect to the gdbserver on the local pc using port 3333. +This would cause GDB to connect to the gdbserver on the local pc using port 3333. +@item +A pipe connection is typically started as follows: +@example +target remote | openocd --pipe +@end example +This would cause GDB to run OpenOCD and communicate using pipes (stdin/stdout). +Using this method has the advantage of GDB starting/stopping OpenOCD for the debug +session. +@end enumerate -To see a list of available OpenOCD commands type @option{monitor help} on the -gdb commandline. +@*To see a list of available OpenOCD commands type @option{monitor help} on the +GDB commandline. OpenOCD supports the gdb @option{qSupported} packet, this enables information -to be sent by the gdb server (openocd) to gdb. Typical information includes +to be sent by the gdb server (OpenOCD) to GDB. Typical information includes packet size and device memory map. -Previous versions of OpenOCD required the following gdb options to increase -the packet size and speed up gdb communication. +Previous versions of OpenOCD required the following GDB options to increase +the packet size and speed up GDB communication. @example set remote memory-write-packet-size 1024 set remote memory-write-packet-size fixed set remote memory-read-packet-size 1024 set remote memory-read-packet-size fixed @end example -This is now handled in the @option{qSupported} PacketSize. +This is now handled in the @option{qSupported} PacketSize and should not be required. -@section Progr... [truncated message content] |
