From: David B. <dbr...@us...> - 2009-10-26 19:14:51
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via d87ee640c7a8e77a34d2d72185be157a97b39061 (commit) via eaebc6cd699bcf414dc307dc65354a9f991dba59 (commit) via 592e021543353e6ef2814713f0a1412e4119710a (commit) from 8b30f22dec336003159039202a68a85670ca9b8b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d87ee640c7a8e77a34d2d72185be157a97b39061 Merge: eaebc6c 8b30f22 Author: David Brownell <dbr...@us...> Date: Mon Oct 26 11:14:28 2009 -0700 Merge branch 'master' of ssh://dbr...@op.../gitroot/openocd/openocd commit eaebc6cd699bcf414dc307dc65354a9f991dba59 Author: Wookey <wo...@wo...> Date: Mon Oct 26 17:06:05 2009 +0000 balloon3 board base config This is the very basic board config for the balloon3 board cpu JTAG channel. The rest of the config comprises another 14 .cfg files which I suspect openocd doesn't really want all of. I'm still not sure how to deal with this. I'll post another mail/patch to discuss. Signed-off-by: David Brownell <dbr...@us...> diff --git a/tcl/board/balloon3-cpu.cfg b/tcl/board/balloon3-cpu.cfg new file mode 100644 index 0000000..8a646b7 --- /dev/null +++ b/tcl/board/balloon3-cpu.cfg @@ -0,0 +1,13 @@ +# Config for balloon3 board, cpu JTAG port. http://balloonboard.org/ +# The board has separate JTAG ports for cpu and CPLD/FPGA devices +# Chaining is done on IO interfaces if desired. + +source [find target/pxa270.cfg] + +# The board supports separate reset lines +# Override this in the interface config for parallel dongles +reset_config trst_and_srst separate + +# flash bank <driver> <base> <size> <chip_width> <bus_width> +# 29LV650 64Mbit Flash +flash bank cfi 0x00000000 0x800000 2 2 0 commit 592e021543353e6ef2814713f0a1412e4119710a Author: Michael Roth <mr...@ne...> Date: Mon Oct 26 14:01:42 2009 +0100 SVF: fix parsing hex strings containing leading '0' characters Ignore leading '0' characters on hex strings. For example a bit pattern consisting of 6 bits could be written as 3f, 03f or 003f and so on. Signed-off-by: Michael Roth <mr...@ne...> Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/svf/svf.c b/src/svf/svf.c index dec4b19..276a374 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -680,6 +680,10 @@ static int svf_copy_hexstring_to_binary(char *str, uint8_t **bin, int orig_bit_l } } + // consume optional leading '0' characters + while (str_len > 0 && str[str_len - 1] == '0') + str_len--; + // check valid if (str_len > 0 || (ch & ~((1 << (4 - (bit_len % 4))) - 1)) != 0) { ----------------------------------------------------------------------- Summary of changes: src/svf/svf.c | 4 ++++ tcl/board/balloon3-cpu.cfg | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 tcl/board/balloon3-cpu.cfg hooks/post-receive -- Main OpenOCD repository |