This is an automated email from Gerrit.
"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8857
-- gerrit
commit cf6af5329f2120b37f7a845e03811ffc9973b945
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date: Sat Apr 19 16:28:50 2025 +0200
target: armv7a: drop command 'cache_config l2x'
The command was already tagged as deprecated in 2015 with commit
0df557728216 ("armv7a: remove l1 flush all data handler") but has
never been removed.
An equivalent command 'cache l2x conf' was introduced at the same
time in commit cd440bd32a12 ("add armv7a_cache handlers").
Drop it and deprecate it.
Replace the old command in the Tcl script.
Change-Id: Ie24eccc99a78786903704d10ee1d9f6c924529b5
Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 9ff524b749..57d2aae323 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -10672,10 +10672,6 @@ Display/set the current core displayed in GDB
Selects whether interrupts will be processed when single stepping
@end deffn
-@deffn {Command} {cache_config l2x} [base way]
-configure l2x cache
-@end deffn
-
@deffn {Command} {cortex_a mmu dump} [@option{0}|@option{1}|@option{addr}
address [@option{num_entries}]]
Dump the MMU translation table from TTB0 or TTB1 register, or from physical
memory location @var{address}. When dumping the table from @var{address},
print at most
diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index c14155e013..fb8862611a 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -179,54 +179,6 @@ done:
return retval;
}
-/* FIXME: remove it */
-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;
-
- struct armv7a_common *armv7a = target_to_armv7a(target);
- l2x_cache = calloc(1, sizeof(struct armv7a_l2x_cache));
- l2x_cache->base = base;
- l2x_cache->way = way;
- /*LOG_INFO("cache l2 initialized base %x way %d",
- l2x_cache->base,l2x_cache->way);*/
- if (armv7a->armv7a_mmu.armv7a_cache.outer_cache)
- LOG_INFO("outer cache already initialized\n");
- armv7a->armv7a_mmu.armv7a_cache.outer_cache = l2x_cache;
- /* initialize all target in this cluster (smp target)
- * l2 cache must be configured after smp declaration */
- 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)
- LOG_ERROR("smp target : outer cache already
initialized\n");
- armv7a->armv7a_mmu.armv7a_cache.outer_cache = l2x_cache;
- }
- }
- return JIM_OK;
-}
-
-/* FIXME: remove it */
-COMMAND_HANDLER(handle_cache_l2x)
-{
- struct target *target = get_current_target(CMD_CTX);
- uint32_t base, way;
-
- if (CMD_ARGC != 2)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- /* 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);
-
- /* AP address is in bits 31:24 of DP_SELECT */
- armv7a_l2x_cache_init(target, base, way);
-
- return ERROR_OK;
-}
-
int armv7a_handle_cache_info_command(struct command_invocation *cmd,
struct armv7a_cache_common *armv7a_cache)
{
@@ -561,33 +513,7 @@ int armv7a_arch_state(struct target *target)
return ERROR_OK;
}
-static const struct command_registration l2_cache_commands[] = {
- {
- .name = "l2x",
- .handler = handle_cache_l2x,
- .mode = COMMAND_EXEC,
- .help = "configure l2x cache",
- .usage = "[base_addr] [number_of_way]",
- },
- COMMAND_REGISTRATION_DONE
-
-};
-
-static const struct command_registration l2x_cache_command_handlers[] = {
- {
- .name = "cache_config",
- .mode = COMMAND_EXEC,
- .help = "cache configuration for a target",
- .usage = "",
- .chain = l2_cache_commands,
- },
- COMMAND_REGISTRATION_DONE
-};
-
const struct command_registration armv7a_command_handlers[] = {
- {
- .chain = l2x_cache_command_handlers,
- },
{
.chain = arm7a_cache_command_handlers,
},
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index e9646097f0..1cc9bb7fda 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -316,3 +316,9 @@ proc _post_init_target_cortex_a_cache_auto {} {
}
}
lappend post_init_commands _post_init_target_cortex_a_cache_auto
+
+lappend _telnet_autocomplete_skip "cache_config l2x"
+proc "cache_config l2x" {args} {
+ echo "DEPRECATED! use 'cache l2x conf' not 'cache_config l2x'"
+ eval cache_config l2x $args
+}
diff --git a/tcl/target/u8500.cfg b/tcl/target/u8500.cfg
index 1fdc11fe34..ea3c7218ee 100644
--- a/tcl/target/u8500.cfg
+++ b/tcl/target/u8500.cfg
@@ -133,7 +133,7 @@ proc enable_apetap {} {
set status [$_TARGETNAME_1 curstate]
if {[string equal "unknown" $status]} {
$_TARGETNAME_1 arp_examine
- cache_config l2x 0xa0412000 8
+ cache l2x conf 0xa0412000 8
}
set status [$_TARGETNAME_2 curstate]
--
