From c46cbe3aa71656b2faf12dfd366bf9a32790027d Mon Sep 17 00:00:00 2001 From: Mathias K Date: Thu, 12 Jan 2012 17:33:05 +0100 Subject: [PATCH] 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 Reviewed-on: http://openocd.zylin.com/369 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/stlink/stlink_layout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jtag/stlink/stlink_layout.c b/src/jtag/stlink/stlink_layout.c index dfcfbf40b..4d510bb04 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; }