summaryrefslogtreecommitdiff
path: root/src/target/arm11.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-11-18 13:22:27 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-11-18 13:22:27 -0800
commitbbebfd9e134ec84a29dd68bc3661ead57435a4c3 (patch)
treedb209d49fd8d9c6f41e104d1b1af7c19419584c6 /src/target/arm11.c
parent9b1f9810b090958bb4a669034173a01683c6e3e9 (diff)
downloadopenocd+libswd-bbebfd9e134ec84a29dd68bc3661ead57435a4c3.tar.gz
openocd+libswd-bbebfd9e134ec84a29dd68bc3661ead57435a4c3.tar.bz2
openocd+libswd-bbebfd9e134ec84a29dd68bc3661ead57435a4c3.tar.xz
openocd+libswd-bbebfd9e134ec84a29dd68bc3661ead57435a4c3.zip
ARM: add "core_type" field to "struct arm"
It's used to flag cores with the "TrustZone" extension, and is used in subsequent patches to set up support for the registers shadowed by its new secure monitor mode. The ARM1176 and Cortex-A8 both support this new mode. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/arm11.c')
-rw-r--r--src/target/arm11.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 3a235852..6e007cfa 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -1780,6 +1780,11 @@ static int arm11_init_target(struct command_context *cmd_ctx,
struct target *target)
{
/* Initialize anything we can set up without talking to the target */
+
+ /* FIXME Switch to use the standard build_reg_cache() not custom
+ * code. Do it from examine(), after we check whether we're
+ * an arm1176 and thus support the Secure Monitor mode.
+ */
return arm11_build_reg_cache(target);
}
@@ -1787,7 +1792,7 @@ static int arm11_init_target(struct command_context *cmd_ctx,
static int arm11_examine(struct target *target)
{
int retval;
-
+ char *type;
FNC_INFO;
struct arm11_common *arm11 = target_to_arm11(target);
@@ -1818,13 +1823,21 @@ static int arm11_examine(struct target *target)
switch (arm11->device_id & 0x0FFFF000)
{
- case 0x07B36000: LOG_INFO("found ARM1136"); break;
- case 0x07B56000: LOG_INFO("found ARM1156"); break;
- case 0x07B76000: LOG_INFO("found ARM1176"); break;
+ case 0x07B36000:
+ type = "ARM1136";
+ break;
+ case 0x07B56000:
+ type = "ARM1156";
+ break;
+ case 0x07B76000:
+ arm11->arm.core_type = ARM_MODE_MON;
+ type = "ARM1176";
+ break;
default:
LOG_ERROR("'target arm11' expects IDCODE 0x*7B*7****");
return ERROR_FAIL;
}
+ LOG_INFO("found %s", type);
arm11->debug_version = (arm11->didr >> 16) & 0x0F;