target: fix build with jimtcl 0.79

[openocd.git] / src / target / armv7a_cache_l2x.c

diff --git a/src/target/armv7a_cache_l2x.c b/src/target/armv7a_cache_l2x.c
index 0aa69538285be99df681109056123012edba9d53..c26d051734cb14543949512dd7fd7f117fd5f2c0 100644 (file)
--- a/src/target/armv7a_cache_l2x.c
+++ b/src/target/armv7a_cache_l2x.c
@@ -27,6 +27,7 @@
 #include <helper/time_support.h>
 #include "target.h"
 #include "target_type.h"
+#include "smp.h"
 
 static int arm7a_l2x_sanity_check(struct target *target)
 {
@@ -180,12 +181,12 @@ static int arm7a_handle_l2x_cache_info_command(struct command_invocation *cmd,
                (armv7a_cache->outer_cache);
 
        if (armv7a_cache->info == -1) {
-               command_print(cmd->ctx, "cache not yet identified");
+               command_print(cmd, "cache not yet identified");
                return ERROR_OK;
        }
 
-       command_print(cmd->ctx,
-                     "L2 unified cache Base Address 0x%" PRIx32 ", %" PRId32 " ways",
+       command_print(cmd,
+                     "L2 unified cache Base Address 0x%" PRIx32 ", %" PRIu32 " ways",
                      l2x_cache->base, l2x_cache->way);
 
        return ERROR_OK;
@@ -194,8 +195,7 @@ static int arm7a_handle_l2x_cache_info_command(struct command_invocation *cmd,
 static int armv7a_l2x_cache_init(struct target *target, uint32_t base, uint32_t way)
 {
        struct armv7a_l2x_cache *l2x_cache;
-       struct target_list *head = target->head;
-       struct target *curr;
+       struct target_list *head;
 
        struct armv7a_common *armv7a = target_to_armv7a(target);
        if (armv7a->armv7a_mmu.armv7a_cache.outer_cache) {
@@ -210,8 +210,8 @@ static int armv7a_l2x_cache_init(struct target *target, uint32_t base, uint32_t
 
        /*  initialize all targets in this cluster (smp target)
         *  l2 cache must be configured after smp declaration */
-       while (head != (struct target_list *)NULL) {
-               curr = head->target;
+       foreach_smp_target(head, target->smp_targets) {
+               struct target *curr = head->target;
                if (curr != target) {
                        armv7a = target_to_armv7a(curr);
                        if (armv7a->armv7a_mmu.armv7a_cache.outer_cache) {
@@ -220,7 +220,6 @@ static int armv7a_l2x_cache_init(struct target *target, uint32_t base, uint32_t
                        }
                        armv7a->armv7a_mmu.armv7a_cache.outer_cache = l2x_cache;
                }
-               head = head->next;
        }
        return ERROR_OK;
 }
@@ -312,7 +311,7 @@ COMMAND_HANDLER(armv7a_l2x_cache_conf_cmd)
        if (CMD_ARGC != 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       /* command_print(CMD_CTX, "%s %s", CMD_ARGV[0], CMD_ARGV[1]); */
+       /* command_print(CMD, "%s %s", CMD_ARGV[0], CMD_ARGV[1]); */
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], base);
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], way);
 
@@ -325,14 +324,14 @@ static const struct command_registration arm7a_l2x_cache_commands[] = {
                .name = "conf",
                .handler = armv7a_l2x_cache_conf_cmd,
                .mode = COMMAND_ANY,
-               .help = "configure l2x cache ",
+               .help = "configure l2x cache",
                .usage = "<base_addr> <number_of_way>",
        },
        {
                .name = "info",
                .handler = arm7a_l2x_cache_info_command,
                .mode = COMMAND_ANY,
-               .help = "print cache realted information",
+               .help = "print cache related information",
                .usage = "",
        },
        {