Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-193-gc6cd253
|
From: Øyvind H. <go...@us...> - 2010-04-24 16:52:19
|
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 c6cd253ae105a9542f051d4af3fda7e9a1c7140b (commit)
via 48e282aa00e8746a3e5e4234c915a4c5f9909063 (commit)
from cc5f3c85de7632a32f41b435c54b83487a3aa622 (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 c6cd253ae105a9542f051d4af3fda7e9a1c7140b
Author: michal smulski <mic...@oo...>
Date: Sat Apr 24 16:51:34 2010 +0200
telo: update configuration scripts to matched master branch
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/tcl/board/telo.cfg b/tcl/board/telo.cfg
index a60cb02..1c0ad76 100644
--- a/tcl/board/telo.cfg
+++ b/tcl/board/telo.cfg
@@ -58,4 +58,4 @@ set _FLASHNAME $_CHIPNAME.flash
flash bank $_FLASHNAME cfi 0x20000000 0x01000000 2 2 $_TARGETNAME
# writing data to memory does not work without this
-memwrite burst disable
\ No newline at end of file
+arm11 memwrite burst disable
\ No newline at end of file
diff --git a/tcl/target/c100config.tcl b/tcl/target/c100config.tcl
index b08f909..17a9476 100644
--- a/tcl/target/c100config.tcl
+++ b/tcl/target/c100config.tcl
@@ -403,9 +403,9 @@ proc flashUBOOT {file} {
flash erase_sector 0 0 3
puts "Programming u-boot"
putsUART0 "Programming u-boot..."
- memwrite burst enable
+ arm11 memwrite burst enable
flash write_image $file $EXP_CS0_BASEADDR
- memwrite burst disable
+ arm11 memwrite burst disable
putsUART0 "done.\n"
putsUART0 "Rebooting, please wait!\n"
reboot
diff --git a/tcl/target/c100helper.tcl b/tcl/target/c100helper.tcl
index 1fd58b6..477fe5c 100644
--- a/tcl/target/c100helper.tcl
+++ b/tcl/target/c100helper.tcl
@@ -325,7 +325,7 @@ proc setupDDR2 {} {
if {$tmp == "128M"} {
configureDDR2regs_128M
} elseif {$tmp == "256M"} {
- configureDDR2regs_256B
+ configureDDR2regs_256M
} else {
puts "Don't know how to configure DDR2 setup?"
}
diff --git a/tcl/target/telo.cfg b/tcl/target/telo.cfg
deleted file mode 100644
index aa9ff22..0000000
--- a/tcl/target/telo.cfg
+++ /dev/null
@@ -1,61 +0,0 @@
-source [find target/c100.cfg]
-# basic register defintion for C100
-source [find target/c100regs.tcl]
-# board-config info
-source [find target/c100config.tcl]
-# C100 helper functions
-source [find target/c100helper.tcl]
-
-
-# Telo board & C100 support trst and srst
-# Note that libftd2xx.so tries to assert srst
-# which break this script
-# use libftdi.so library instead with this script
-# make the reset asserted to
-# allow RC circuit to discharge for: [ms]
-adapter_nsrst_assert_width 100
-jtag_ntrst_assert_width 100
-# don't talk to JTAG after reset for: [ms]
-adapter_nsrst_delay 100
-jtag_ntrst_delay 100
-reset_config trst_and_srst separate
-
-
-
-
-# issue telnet: reset init
-# issue gdb: monitor reset init
-$_TARGETNAME configure -event reset-init {
- adapter_khz 100
- # this will setup Telo board
- setupTelo
- #turn up the JTAG speed
- adapter_khz 3000
- puts "JTAG speed now 3MHz"
- puts "type helpC100 to get help on C100"
-}
-
-$_TARGETNAME configure -event reset-deassert-post {
- # Force target into ARM state.
-# soft_reset_halt # not implemented on ARM11
- puts "Detected SRSRT asserted on C100.CPU"
-
-}
-
-$_TARGETNAME configure -event reset-assert-post {
- puts "Assering reset"
- #sleep 10
-}
-
-proc power_restore {} { puts "Sensed power restore. No action." }
-proc srst_deasserted {} { puts "Sensed nSRST deasserted. No action." }
-
-
-# boots from NOR on CS0: 8 MBytes CFI flash, 16-bit bus
-# it's really 16MB but the upper 8mb is controller via gpio
-# openocd does not support 'complex reads/writes' to NOR
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x20000000 0x01000000 2 2 $_TARGETNAME
-
-# writing data to memory does not work without this
-memwrite burst disable
commit 48e282aa00e8746a3e5e4234c915a4c5f9909063
Author: michal smulski <mic...@oo...>
Date: Sat Apr 24 16:50:27 2010 +0200
adapter: allow adjusting srst assert with
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index b262a9a..50e2a02 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -366,6 +366,23 @@ COMMAND_HANDLER(handle_adapter_nsrst_delay_command)
return ERROR_OK;
}
+COMMAND_HANDLER(handle_adapter_nsrst_assert_width_command)
+{
+ if (CMD_ARGC > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ if (CMD_ARGC == 1)
+ {
+ unsigned width;
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], width);
+
+ jtag_set_nsrst_assert_width(width);
+ }
+ command_print(CMD_CTX, "adapter_nsrst_assert_width: %u", jtag_get_nsrst_assert_width());
+ return ERROR_OK;
+}
+
+
+
COMMAND_HANDLER(handle_adapter_khz_command)
{
if (CMD_ARGC > 1)
@@ -421,6 +438,13 @@ static const struct command_registration interface_command_handlers[] = {
.usage = "[milliseconds]",
},
{
+ .name = "adapter_nsrst_assert_width",
+ .handler = handle_adapter_nsrst_assert_width_command,
+ .mode = COMMAND_ANY,
+ .help = "delay after asserting SRST in ms",
+ .usage = "[milliseconds]",
+ },
+ {
.name = "interface",
.handler = handle_interface_command,
.mode = COMMAND_CONFIG,
-----------------------------------------------------------------------
Summary of changes:
src/jtag/adapter.c | 24 +++++++++++++++++
tcl/board/telo.cfg | 2 +-
tcl/target/c100config.tcl | 4 +-
tcl/target/c100helper.tcl | 2 +-
tcl/target/telo.cfg | 61 ---------------------------------------------
5 files changed, 28 insertions(+), 65 deletions(-)
delete mode 100644 tcl/target/telo.cfg
hooks/post-receive
--
Main OpenOCD repository
|