aarch64: remove references to armv7-r

aarch64 target doesn't support the -r profile anyway.

Change-Id: Iaa470ed9f95ea495ab1bafdf401f55a1ebcefddf
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 948a2076380535ba9e7a9bd7232326c49682ca95..e215206b468293ef1f42886d2b4ff9964360b0ec 100644 (file)
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -2152,11 +2152,9 @@ static int aarch64_read_memory(struct target *target, target_addr_t address,
                size, count);
 
        /* determine if MMU was enabled on target stop */
-       if (!armv8->is_armv7r) {
-               retval = aarch64_mmu(target, &mmu_enabled);
-               if (retval != ERROR_OK)
-                       return retval;
-       }
+       retval = aarch64_mmu(target, &mmu_enabled);
+       if (retval != ERROR_OK)
+               return retval;
 
        if (armv8->memory_ap_available && (apsel == armv8->memory_ap->ap_num)) {
                if (mmu_enabled) {
@@ -2209,16 +2207,13 @@ static int aarch64_write_phys_memory(struct target *target,
                } else {
 
                        /* write memory through APB-AP */
-                       if (!armv8->is_armv7r) {
-                               retval = aarch64_mmu_modify(target, 0);
-                               if (retval != ERROR_OK)
-                                       return retval;
-                       }
+                       retval = aarch64_mmu_modify(target, 0);
+                       if (retval != ERROR_OK)
+                               return retval;
                        return aarch64_write_apb_ap_memory(target, address, size, count, buffer);
                }
        }
 
-
        /* REVISIT this op is generic ARMv7-A/R stuff */
        if (retval == ERROR_OK && target->state == TARGET_HALTED) {
                struct arm_dpm *dpm = armv8->arm.dpm;
@@ -2291,11 +2286,9 @@ static int aarch64_write_memory(struct target *target, target_addr_t address,
                  "; count %" PRId32, address, size, count);
 
        /* determine if MMU was enabled on target stop */
-       if (!armv8->is_armv7r) {
-               retval = aarch64_mmu(target, &mmu_enabled);
-               if (retval != ERROR_OK)
-                       return retval;
-       }
+       retval = aarch64_mmu(target, &mmu_enabled);
+       if (retval != ERROR_OK)
+               return retval;
 
        if (armv8->memory_ap_available && (apsel == armv8->memory_ap->ap_num)) {
                LOG_DEBUG("Writing memory to address 0x%" TARGET_PRIxADDR "; size %"
@@ -2580,8 +2573,6 @@ static int aarch64_target_create(struct target *target, Jim_Interp *interp)
 {
        struct aarch64_common *aarch64 = calloc(1, sizeof(struct aarch64_common));
 
-       aarch64->armv8_common.is_armv7r = false;
-
        return aarch64_init_arch_info(target, aarch64, target->tap);
 }
 

diff --git a/src/target/armv8.h b/src/target/armv8.h
index 884d39a3ac9fa33218c9925c495f61e908bacc1e..169bcb386a8dc3d5a3a5ff9ea49563c23ded0671 100644 (file)
--- a/src/target/armv8.h
+++ b/src/target/armv8.h
@@ -139,7 +139,6 @@ struct armv8_common {
        uint8_t multi_processor_system;
        uint8_t cluster_id;
        uint8_t cpu_id;
-       bool is_armv7r;
 
        /* armv8 aarch64 need below information for page translation */
        uint8_t va_size;