diff options
| author | Mathias K <kesmtp@freenet.de> | 2012-01-12 17:33:05 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-01-12 22:32:21 +0000 |
| commit | c46cbe3aa71656b2faf12dfd366bf9a32790027d (patch) | |
| tree | 5659d162c9a69e309aeb3499ea88d180884c8a9a | |
| parent | c2ab3b4d5efba0201d88d899dc0fd310574ef5b9 (diff) | |
| download | riscv-openocd-c46cbe3aa71656b2faf12dfd366bf9a32790027d.zip riscv-openocd-c46cbe3aa71656b2faf12dfd366bf9a32790027d.tar.gz riscv-openocd-c46cbe3aa71656b2faf12dfd366bf9a32790027d.tar.bz2 | |
stlink: handle wrong initialization file if no layout was specified
This patch remove the hardcoded default layout and return an error
if no layout was specified in the configuration file.
Change-Id: I0e7833faa2dc194e727122840bcbdacd321cc4fd
Signed-off-by: Mathias K <kesmtp@freenet.de>
Reviewed-on: http://openocd.zylin.com/369
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
| -rw-r--r-- | src/jtag/stlink/stlink_layout.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c index dfcfbf4..4d510bb 100644 --- a/src/jtag/stlink/stlink_layout.c +++ b/src/jtag/stlink/stlink_layout.c @@ -79,7 +79,9 @@ int stlink_layout_init(struct stlink_interface_s *stlink_if) { LOG_DEBUG("stlink_layout_init"); - stlink_if->layout = &stlink_layouts[0]; - + if (stlink_if->layout == NULL) { + LOG_ERROR("no layout specified"); + return ERROR_FAIL; + } return ERROR_OK; } |