Add init_board procedure executed after init_targets

This adds init_board procedure that behaves exactly the same as
init_targets - it can be overriden by "next level" scripts. This
procedure is executed after init_targets, allowing common stuff (jtag
chain, memory, flash, ...) to be configured in target script (via
init_target) and leaving rest (like additional memory, reset
configuration, reset-init handlers, ...) to be done in init_board.

This makes init_targets scheme more complete and easier to use - current
board scripts will not need new init_targets, because everything can be
"packed" in init_boards. Moreover it solves the problem of variables
being set in init_targets (executed after init), which were not
accessible by "linear" scripts (parsed before init). All that has to be
done is to enclose all code in board config file in init_board
procedure.

Change-Id: I0736b1ff9873a687966407d62b58ccf29a8e597b
Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-on: http://openocd.zylin.com/427
Reviewed-by: Chris Morgan <chmorgan@gmail.com>
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index 425e1ecfb0df3ec2457d3d89a8c86de36c2800e6..02cefb09b23a1b83413083a39979b89393395d5b 100644 (file)
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -159,3 +159,7 @@ proc armv4_5 params {
 # By default(classic) the config scripts will set up the target configuration
 proc init_targets {} {
 }
+
+# Additionally board config scripts can define a procedure init_board that will be executed after init and init_targets
+proc init_board {} {
+}

diff --git a/src/target/target.c b/src/target/target.c
index 5b2117df71b44b47b7d325eec0ac824972052d51..f8326ea72b0800362140dab39aaccb2bac1b2ce4 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1033,6 +1033,10 @@ COMMAND_HANDLER(handle_target_init_command)
        if (ERROR_OK != retval)
                return retval;
 
+       retval = command_run_line(CMD_CTX, "init_board");
+       if (ERROR_OK != retval)
+               return retval;
+
        LOG_DEBUG("Initializing targets...");
        return target_init(CMD_CTX);
 }