split NOR and NAND flash headers

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

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 6872b38f2a3273b0ae7ac0a3d57e1ef53b6bcfb9..f089c5c5e83bc12e96b4f229414f66e9c89c99a2 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -21,7 +21,7 @@
 
 #include <target/arm_adi_v5.h>
 #include <target/armv4_5.h>
-#include "armv4_5_mmu.h"
+#include <target/armv4_5_mmu.h>
 #include <target/armv4_5_cache.h>
 #include <target/arm_dpm.h>
 
@@ -114,16 +114,6 @@ target_to_armv7a(struct target *target)
 /* See ARMv7a arch spec section C10.8 */
 #define CPUDBG_AUTHSTATUS      0xFB8
 
-/* DSCR bit numbers (See ARMv7a arch spec section 12.4.5) */
-#define DSCR_CORE_HALTED       0
-#define DSCR_CORE_RESTARTED    1
-#define DSCR_EXT_INT_EN                13
-#define DSCR_HALT_DBG_MODE     14
-#define DSCR_MON_DBG_MODE      15
-#define DSCR_INSTR_COMP                24
-#define DSCR_DTR_TX_FULL       29
-#define DSCR_DTR_RX_FULL       30
-
 struct armv7a_algorithm
 {
        int common_magic;