arm_debug: Support multiple APs per DAP and remove DAP from armv7* structs

[fw/openocd] / src / target / armv7a.h

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 8d7bece11724e2d135738756f3658f1ed62271fc..cb7eb01ff838ad21b35effb6a111e70fd835ce71 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -92,7 +92,6 @@ struct armv7a_mmu_common {
        uint32_t ttbcr;     /* cache for ttbcr register */
        uint32_t ttbr_mask[2];
        uint32_t ttbr_range[2];
-       uint32_t os_border;
 
        int (*read_physical_memory)(struct target *target, uint32_t address, uint32_t size,
                        uint32_t count, uint8_t *buffer);
@@ -105,8 +104,6 @@ struct armv7a_common {
        int common_magic;
        struct reg_cache *core_cache;
 
-       struct adiv5_dap dap;
-
        /* Core Debug Unit */
        struct arm_dpm dpm;
        uint32_t debug_base;