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>

diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c
index dfcfbf40ba4a43cf5ebe29c714342208273737ca..4d510bb047e3aac2abf9df093dddb17ac4df8ca7 100644 (file)
--- 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;
 }