This is an automated email from the ASF dual-hosted git repository.

GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit e343c4535601698077949f0be658417d7ff5f9f1
Author: hujun5 <[email protected]>
AuthorDate: Mon Nov 17 18:55:00 2025 +0800

    arch/arm_a_r: merge sctlr.h
    
    Move the shared SCTLR definitions into arm_a_r and remove the duplicate 
ARMv7-R and ARMv8-R copies.
    
    Signed-off-by: hujun5 <[email protected]>
---
 arch/arm/src/{armv7-a => arm_a_r}/sctlr.h | 213 +++++---
 arch/arm/src/armv7-r/sctlr.h              | 803 ----------------------------
 arch/arm/src/armv8-r/sctlr.h              | 846 ------------------------------
 arch/arm/src/common/Toolchain.defs        |   4 +
 4 files changed, 130 insertions(+), 1736 deletions(-)

diff --git a/arch/arm/src/armv7-a/sctlr.h b/arch/arm/src/arm_a_r/sctlr.h
similarity index 64%
rename from arch/arm/src/armv7-a/sctlr.h
rename to arch/arm/src/arm_a_r/sctlr.h
index a244a2b57a3..ef1a382b747 100644
--- a/arch/arm/src/armv7-a/sctlr.h
+++ b/arch/arm/src/arm_a_r/sctlr.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/armv7-a/sctlr.h
+ * arch/arm/src/arm_a_r/sctlr.h
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -29,8 +29,8 @@
  *  All rights reserved. ARM DDI 0406C.b (ID072512)
  */
 
-#ifndef __ARCH_ARM_SRC_ARMV7_A_SCTLR_H
-#define __ARCH_ARM_SRC_ARMV7_A_SCTLR_H
+#ifndef __ARCH_ARM_SRC_ARM_A_R_SCTLR_H
+#define __ARCH_ARM_SRC_ARM_A_R_SCTLR_H
 
 /****************************************************************************
  * Included Files
@@ -38,6 +38,7 @@
 
 #include <arch/barriers.h>
 #include <arch/irq.h>
+#include <arch/arm_a_r/cp15.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -129,38 +130,76 @@
  * (2) Not available on A5
  */
 
-#define SCTLR_M                  (1 << 0)  /* Bit 0:  Enables the MMU */
-#define SCTLR_A                  (1 << 1)  /* Bit 1:  Enables strict alignment 
of data */
-#define SCTLR_C                  (1 << 2)  /* Bit 2:  Determines if data can 
be cached */
-                                           /* Bits 3-9: Reserved */
-#define SCTLR_SW                 (1 << 10) /* Bit 10: SWP/SWPB Enable bit */
-#define SCTLR_Z                  (1 << 11) /* Bit 11: Program flow prediction 
control (1) */
-#define SCTLR_I                  (1 << 12) /* Bit 12: Determines if 
instructions can be cached */
-#define SCTLR_V                  (1 << 13) /* Bit 13: Vectors bit */
-#define SCTLR_RR                 (1 << 14) /* Bit 14: Cache replacement 
strategy (2) */
-                                           /* Bits 15-16: Reserved */
-#define SCTLR_HA                 (1 << 17) /* Bit 17: Hardware management 
access disabled (2) */
-                                           /* Bits 18-24: Reserved */
-#define SCTLR_EE                 (1 << 25) /* Bit 25: Determines the value the 
CPSR.E */
-                                           /* Bit 26: Reserved */
-#define SCTLR_NMFI               (1 << 27) /* Bit 27: Non-maskable FIQ support 
(Cortex-A9) */
-#define SCTLR_TRE                (1 << 28) /* Bit 28: TEX remap */
-#define SCTLR_AFE                (1 << 29) /* Bit 29: Access Flag Enable bit */
-#define SCTLR_TE                 (1 << 30) /* Bit 30: Thumb exception enable */
-                                           /* Bit 31: Reserved */
+#define SCTLR_M                       (1 << 0)  /* Bit 0:  Enables the MMU/MPU 
enable bit */
+#define SCTLR_A                       (1 << 1)  /* Bit 1:  Enables strict 
alignment of data */
+#define SCTLR_C                       (1 << 2)  /* Bit 2:  Determines if data 
can be cached */
+                                                /* Bits 3-9: Reserved */
+#define SCTLR_CCP15BEN                (1 << 5)  /* Bit 5:  CP15 barrier enable 
*/
+                                                /* Bit 6:  Reserved */
+#define SCTLR_B                       (1 << 7)  /* Bit 7:  Should be zero on 
ARMv7-R */
+#define SCTLR_SW                      (1 << 10) /* Bit 10: SWP/SWPB Enable bit 
*/
+#define SCTLR_Z                       (1 << 11) /* Bit 11: Program flow 
prediction control (1) */
+#define SCTLR_I                       (1 << 12) /* Bit 12: Determines if 
instructions can be cached */
+#define SCTLR_V                       (1 << 13) /* Bit 13: Vectors bit */
+#define SCTLR_RR                      (1 << 14) /* Bit 14: Cache replacement 
strategy (2) */
+                                                /* Bits 15-16: Reserved */
+#define SCTLR_HA                      (1 << 17) /* Bit 17: Hardware management 
access disabled (2) */
+                                                /* Bits 18-24: Reserved */
+#define SCTLR_BR                      (1 << 17) /* Bit 17: Background Region 
bit */
+                                                /* Bit 18: Reserved */
+#define SCTLR_DZ                      (1 << 19) /* Bit 19: Divide by Zero 
fault enable bit */
+                                                /* Bit 20: Reserved */
+#define SCTLR_FI                      (1 << 21) /* Bit 21: Fast interrupts 
configuration enable bit */
+#define SCTLR_U                       (1 << 22) /* Bit 22: Unaligned access 
model (always one) */
+#define SCTLR_VE                      (1 << 24) /* Bit 24: Interrupt Vectors 
Enable bit */
+#define SCTLR_EE                      (1 << 25) /* Bit 25: Determines the 
value the CPSR.E */
+                                                /* Bit 26: Reserved */
+#define SCTLR_NMFI                    (1 << 27) /* Bit 27: Non-maskable FIQ 
support (Cortex-A9)/Non-maskable FIQ (NMFI) support */
+#define SCTLR_TRE                     (1 << 28) /* Bit 28: TEX remap */
+#define SCTLR_AFE                     (1 << 29) /* Bit 29: Access Flag Enable 
bit */
+#define SCTLR_TE                      (1 << 30) /* Bit 30: Thumb exception 
enable */
+                                                /* Bit 31: Reserved */
+
+/* Hyp Auxiliary Control Register */
+
+#define HACTLR_CPUACTLR               (1 << 0)  /* Bit 0: Enable write access 
IMP_CPUACTLR from EL1 */
+#define HACTLR_CDBGDCI                (1 << 1)  /* Bit 1: Enable access 
CDBGDCI from EL1 */
+                                                /* Bits 2-6: Reserved */
+#define HACTLR_FLASHIFREGIONR         (1 << 7)  /* Bit 7: Enable access 
IMP_FLASHIFREGIONR from EL1 */
+#define HACTLR_PERIPHPREGIONR         (1 << 8)  /* Bit 8: Enable access 
IMP_PERIPHPREGIONR from EL1 */
+#define HACTLR_QOSR_BIT               (1 << 9)  /* Bit 9: Enable access QOSR 
from EL1 */
+#define HACTLR_BUSTIMEOUTR_BIT        (1 << 10) /* Bit 10: Enable access 
IMP_BUSTIMEOUTR from EL1 */
+                                                /* Bit 11: Reserved */
+#define HACTLR_INTMONR_BIT            (1 << 12) /* Bit 12: Enable access 
IMP_INTMONR from EL1 */
+#define HACTLR_ERR_BIT                (1 << 13) /* Bit 13: Enable access 
IMP_*ERR registers from EL1 */
+                                                /* Bit 14: Reserved */
+#define HACTLR_TESTR1_BIT             (1 << 15) /* Bit 15: Enable access 
IMP_TESTR1 registers from EL0 and EL1 */
+                                                /* Bits 16-31: Reserved */
+
+/* Enable all IMP DEF registers access from EL1 except for TESTR1 */
+
+#define HACTLR_INIT                   (HACTLR_ERR_BIT | HACTLR_INTMONR_BIT | \
+                                       HACTLR_BUSTIMEOUTR_BIT | 
HACTLR_QOSR_BIT | \
+                                       HACTLR_PERIPHPREGIONR | 
HACTLR_FLASHIFREGIONR | \
+                                       HACTLR_CDBGDCI | HACTLR_CPUACTLR) 
 
 /* Auxiliary Control Register (ACTLR) */
 
-#define ACTLR_FW                 (1 << 0)  /* Bit 0: Enable Cache/TLB 
maintenance broadcast */
-#define ACTLR_L2_PREFECTH        (1 << 1)  /* Bit 1: L2 pre-fetch hint enable 
*/
-#define ACTLR_L1_PREFETCH        (1 << 2)  /* Bit 2: L1 Dside pre-fetch enable 
*/
-#define ACTLR_LINE_ZERO          (1 << 3)  /* Bit 3: Enable write full line 
zero mode */
-                                           /* Bits 4-5: Reserved */
-#define ACTLR_SMP                (1 << 6)  /* Bit 6: Cortex-A9 taking part in 
coherency */
-#define ACTLR_EXCL               (1 << 7)  /* Bit 7: Exclusive cache bit */
-#define ACTLR_ALLOC_1WAY         (1 << 8)  /* Bit 8: Allocation in 1-way cache 
only */
-#define ACTLR_PARITY             (1 << 9)  /* Bit 9: Parity ON */
-                                           /* Bits 10-31: Reserved */
+#define ACTLR_FW                      (1 << 0)  /* Bit 0: Enable Cache/TLB 
maintenance broadcast */
+#define ACTLR_L2_PREFECTH             (1 << 1)  /* Bit 1: L2 pre-fetch hint 
enable */
+#define ACTLR_L1_PREFETCH             (1 << 2)  /* Bit 2: L1 Dside pre-fetch 
enable */
+#define ACTLR_LINE_ZERO               (1 << 3)  /* Bit 3: Enable write full 
line zero mode */
+#define ACTLR_MRP                     (1 << 3)  /* Bit 3: Enable MRP */
+                                                /* Bits 4-5: Reserved */
+                                                /* Bits 4-5: Reserved */
+#define ACTLR_SMP                     (1 << 6)  /* Bit 6: Cortex-A9 taking 
part in coherency */
+#define ACTLR_EXCL                    (1 << 7)  /* Bit 7: Exclusive cache bit 
*/
+#define ACTLR_ALLOC_1WAY              (1 << 8)  /* Bit 8: Allocation in 1-way 
cache only */
+#define ACTLR_PARITY                  (1 << 9)  /* Bit 9: Parity ON */
+#define ACTLR_DTCM_ECC                (1 << 9)  /* Bit 9: ECC on caches and 
DTCM */
+#define ACTLR_ITCM_ECC                (1 << 10) /* Bit 10: ECC on caches and 
ITCM */
+#define ACTLR_ITCM_QOS                (1 << 11) /* Bit 11: Enable QoS*/
+                                                /* Bits 12-31: Reserved */
 
 /* Coprocessor Access Control Register (CPACR) */
 
@@ -168,18 +207,18 @@
 
 /* Secure Configuration Register (SCR) */
 
-#define SCR_NS                   (1 << 0)  /* Bit 0: Non-secure */
-#define SCR_IRQ                  (1 << 1)  /* Bit 1: IRQs taken in Monitor 
mode */
-#define SCR_FIQ                  (1 << 2)  /* Bit 2: FIQs taken in Monitor 
mode */
-#define SCR_EA                   (1 << 3)  /* Bit 3: External aborts taken in 
Monitor mode */
-#define SCR_FW                   (1 << 4)  /* Bit 4: F bit writable */
-#define SCR_AW                   (1 << 5)  /* Bit 5: A bit writable */
-#define SCR_NET                  (1 << 6)  /* Bit 6: Not Early Termination */
-#define SCR_SCD                  (1 << 7)  /* Bit 7: Secure Monitor Call 
disable */
-#define SCR_HCE                  (1 << 8)  /* Bit 8: Hyp Call enable */
-#define SCR_SIF                  (1 << 9)  /* Bit 9: Secure state instruction 
fetches from
-                                            *        Non-secure memory are not 
permitted */
-                                           /* Bits 10-31: Reserved */
+#define SCR_NS                        (1 << 0)  /* Bit 0: Non-secure */
+#define SCR_IRQ                       (1 << 1)  /* Bit 1: IRQs taken in 
Monitor mode */
+#define SCR_FIQ                       (1 << 2)  /* Bit 2: FIQs taken in 
Monitor mode */
+#define SCR_EA                        (1 << 3)  /* Bit 3: External aborts 
taken in Monitor mode */
+#define SCR_FW                        (1 << 4)  /* Bit 4: F bit writable */
+#define SCR_AW                        (1 << 5)  /* Bit 5: A bit writable */
+#define SCR_NET                       (1 << 6)  /* Bit 6: Not Early 
Termination */
+#define SCR_SCD                       (1 << 7)  /* Bit 7: Secure Monitor Call 
disable */
+#define SCR_HCE                       (1 << 8)  /* Bit 8: Hyp Call enable */
+#define SCR_SIF                       (1 << 9)  /* Bit 9: Secure state 
instruction fetches from
+                                                 *        Non-secure memory 
are not permitted */
+                                                /* Bits 10-31: Reserved */
 
 /* Secure Debug Enable Register (SDER) */
 
@@ -187,15 +226,15 @@
 
 /* Non-secure Access Control Register (NSACR) */
 
-                                           /* Bits 0-9: Reserved */
-#define NSACR_CP10               (1 << 10) /* Bit 10: Permission to access 
coprocessor 10 */
-#define NSACR_CP11               (1 << 11) /* Bit 11: Permission to access 
coprocessor 11 */
-                                           /* Bits 12-13: Reserved */
-#define NSACR_NSD32DIS           (1 << 14) /* Bit 14: Disable the Non-secure 
use of VFP D16-D31 */
-#define NSACR_NSASEDIS           (1 << 15) /* Bit 15: Disable Non-secure 
Advanced SIMD Extension */
-                                           /* Bits 16-17: Reserved */
-#define NSACR_NSSMP              (1 << 18) /* Bit 18: ACR SMP bit writable */
-                                           /* Bits 19-31: Reserved */
+                                                /* Bits 0-9: Reserved */
+#define NSACR_CP10                    (1 << 10) /* Bit 10: Permission to 
access coprocessor 10 */
+#define NSACR_CP11                    (1 << 11) /* Bit 11: Permission to 
access coprocessor 11 */
+                                                /* Bits 12-13: Reserved */
+#define NSACR_NSD32DIS                (1 << 14) /* Bit 14: Disable the 
Non-secure use of VFP D16-D31 */
+#define NSACR_NSASEDIS                (1 << 15) /* Bit 15: Disable Non-secure 
Advanced SIMD Extension */
+                                                /* Bits 16-17: Reserved */
+#define NSACR_NSSMP                   (1 << 18) /* Bit 18: ACR SMP bit 
writable */
+                                                /* Bits 19-31: Reserved */
 
 /* Virtualization Control Register (VCR) */
 
@@ -249,7 +288,7 @@
 
 /* Vector Base Address Register (VBAR) */
 
-#define VBAR_MASK                (0xffffffe0)
+#define VBAR_MASK                     (0xffffffe0)
 
 /* Monitor Vector Base Address Register (MVBAR) */
 
@@ -265,10 +304,10 @@
 
 /* Context ID Register (CONTEXTIDR) */
 
-#define CONTEXTIDR_ASID_SHIFT    (0)   /* Bits 0-7: Address Space Identifier */
-#define CONTEXTIDR_ASID_MASK     (0xff << CONTEXTIDR_ASID_SHIFT)
-#define CONTEXTIDR_PROCID_SHIFT  (8) /* Bits 8-31: Process Identifier */
-#define CONTEXTIDR_PROCID_MASK   (0x00ffffff << CONTEXTIDR_PROCID_SHIFT)
+#define CONTEXTIDR_ASID_SHIFT         (0)   /* Bits 0-7: Address Space 
Identifier */
+#define CONTEXTIDR_ASID_MASK          (0xff << CONTEXTIDR_ASID_SHIFT)
+#define CONTEXTIDR_PROCID_SHIFT       (8) /* Bits 8-31: Process Identifier */
+#define CONTEXTIDR_PROCID_MASK        (0x00ffffff << CONTEXTIDR_PROCID_SHIFT)
 
 /* Configuration Base Address Register (CBAR) */
 
@@ -280,42 +319,42 @@
  * CRn=c9, opc1=0, CRm=c12, opc2=0
  */
 
-#define PMCR_E             (1 << 0)  /* Enable all counters */
-#define PMCR_P             (1 << 1)  /* Reset all counter events (except 
PMCCNTR) */
-#define PMCR_C             (1 << 2)  /* Reset cycle counter (PMCCNTR) to zero 
*/
-#define PMCR_D             (1 << 3)  /* Enable cycle counter clock (PMCCNTR) 
divider */
-#define PMCR_X             (1 << 4)  /* Export of events is enabled */
-#define PMCR_DP            (1 << 5)  /* Disable PMCCNTR if event counting is 
prohibited */
-#define PMCR_N_SHIFT       (11)      /* Bits 11-15:  Number of event counters 
*/
-#define PMCR_N_MASK        (0x1f << PMCR_N_SHIFT)
-#define PMCR_IDCODE_SHIFT  (16)      /* Bits 16-23: Identification code */
-#define PMCR_IDCODE_MASK   (0xff << PMCR_IDCODE_SHIFT)
-#define PMCR_IMP_SHIFT     (24)      /* Bits 24-31: Implementer code */
-#define PMCR_IMP_MASK      (0xff << PMCR_IMP_SHIFT)
+#define PMCR_E                        (1 << 0)  /* Enable all counters */
+#define PMCR_P                        (1 << 1)  /* Reset all counter events 
(except PMCCNTR) */
+#define PMCR_C                        (1 << 2)  /* Reset cycle counter 
(PMCCNTR) to zero */
+#define PMCR_D                        (1 << 3)  /* Enable cycle counter clock 
(PMCCNTR) divider */
+#define PMCR_X                        (1 << 4)  /* Export of events is enabled 
*/
+#define PMCR_DP                       (1 << 5)  /* Disable PMCCNTR if event 
counting is prohibited */
+#define PMCR_N_SHIFT                  (11)      /* Bits 11-15:  Number of 
event counters */
+#define PMCR_N_MASK                   (0x1f << PMCR_N_SHIFT)
+#define PMCR_IDCODE_SHIFT             (16)      /* Bits 16-23: Identification 
code */
+#define PMCR_IDCODE_MASK              (0xff << PMCR_IDCODE_SHIFT)
+#define PMCR_IMP_SHIFT                (24)      /* Bits 24-31: Implementer 
code */
+#define PMCR_IMP_MASK                 (0xff << PMCR_IMP_SHIFT)
 
 /* 32-bit Performance Monitors Count Enable Set register (PMCNTENSET):
  * CRn=c9, opc1=0, CRm=c12, opc2=1
  */
 
-#define PMCESR_CCES        (1 << 31) /* Bits 31: Count Enable Set Register */
+#define PMCESR_CCES                   (1 << 31) /* Bits 31: Count Enable Set 
Register */
 
 /* 32-bit Performance Monitors Count Enable Clear register (PMCNTENCLR):
  * CRn=c9, opc1=0, CRm=c12, opc2=2
  */
 
-#define PMCECR_CCEC        (1 << 31) /* Bits 31: Count Enable Clear Register */
+#define PMCECR_CCEC                   (1 << 31) /* Bits 31: Count Enable Clear 
Register */
 
 /* 32-bit Performance Monitors Overflow Flag Status Register (PMOVSR):
  * CRn=c9, opc1=0, CRm=c12, opc2=3
  */
 
-#define PMOFSR_COF0        (1 << 0)  /* Bits  0: Counter 0 overflow flag */
-#define PMOFSR_COF1        (1 << 1)  /* Bits  1: Counter 1 overflow flag */
-#define PMOFSR_COF2        (1 << 2)  /* Bits  2: Counter 2 overflow flag */
-#define PMOFSR_COF3        (1 << 3)  /* Bits  3: Counter 3 overflow flag */
-#define PMOFSR_COF4        (1 << 4)  /* Bits  4: Counter 4 overflow flag */
-#define PMOFSR_COF5        (1 << 5)  /* Bits  5: Counter 5 overflow flag */
-#define PMOFSR_CCOF        (1 << 31) /* Bits 31: Cycle counter overflow flag */
+#define PMOFSR_COF0                   (1 << 0)  /* Bits  0: Counter 0 overflow 
flag */
+#define PMOFSR_COF1                   (1 << 1)  /* Bits  1: Counter 1 overflow 
flag */
+#define PMOFSR_COF2                   (1 << 2)  /* Bits  2: Counter 2 overflow 
flag */
+#define PMOFSR_COF3                   (1 << 3)  /* Bits  3: Counter 3 overflow 
flag */
+#define PMOFSR_COF4                   (1 << 4)  /* Bits  4: Counter 4 overflow 
flag */
+#define PMOFSR_COF5                   (1 << 5)  /* Bits  5: Counter 5 overflow 
flag */
+#define PMOFSR_CCOF                   (1 << 31) /* Bits 31: Cycle counter 
overflow flag */
 
 /* 32-bit Performance Monitors Software Increment register (PMSWINC):
  * CRn=c9, opc1=0, CRm=c12, opc2=4
@@ -326,7 +365,7 @@
  * CRn=c9, opc1=0, CRm=c12, opc2=5
  */
 
-#define PMECSR_CS_MASK     (0x1f)    /* Bits 0-5: Counter select */
+#define PMECSR_CS_MASK                (0x1f)    /* Bits 0-5: Counter select */
 
 /* 32-bit Performance Monitors Common Event Identification (PMCEID0):
  * CRn=c9, opc1=0, CRm=c12, opc2=6
@@ -388,22 +427,22 @@
  * CRn=c9, opc1=0, CRm=c14, opc2=0
  */
 
-#define PMUER_UME_SHIFT      (0)       /* Bits 0: User mode enable */
-#define PMUER_UME            (1 << PMUER_UME_SHIFT)
+#define PMUER_UME_SHIFT               (0)       /* Bits 0: User mode enable */
+#define PMUER_UME                     (1 << PMUER_UME_SHIFT)
 
 /* 32-bit Performance Monitors Interrupt Enable Set register (PMINTENSET):
  * CRn=c9, opc1=0, CRm=c14, opc2=1
  */
 
-#define PMIESR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIESR_CCNTOIE       (1 << PMIESR_CCNTOIE_SHIFT)
+#define PMIESR_CCNTOIE_SHIFT          (31)    /* Bits 31: CCNT overflow 
interrupt enable. */
+#define PMIESR_CCNTOIE                (1 << PMIESR_CCNTOIE_SHIFT)
 
 /* 32-bit Performance Monitors Interrupt Enable Clear register (PMINTENCLR):
  * CRn=c9, opc1=0, CRm=c14, opc2=2
  */
 
-#define PMIECR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIECR_CCNTOIE       (1 << PMIECR_CCNTOIE_SHIFT)
+#define PMIECR_CCNTOIE_SHIFT          (31)    /* Bits 31: CCNT overflow 
interrupt enable. */
+#define PMIECR_CCNTOIE                (1 << PMIECR_CCNTOIE_SHIFT)
 
 /****************************************************************************
  * Assembly Macros
@@ -756,4 +795,4 @@ extern "C"
 #endif
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_ARM_SRC_ARMV7_A_SCTLR_H */
+#endif /* __ARCH_ARM_SRC_ARM_A_R_SCTLR_H */
diff --git a/arch/arm/src/armv7-r/sctlr.h b/arch/arm/src/armv7-r/sctlr.h
deleted file mode 100644
index f0a7c264992..00000000000
--- a/arch/arm/src/armv7-r/sctlr.h
+++ /dev/null
@@ -1,803 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7-r/sctlr.h
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/* References:
- *
- *  "ARM Architecture Reference Manual, ARMv7-A and ARMv7-R edition",
- *  Copyright 1996-1998, 2000, 2004-2012 ARM.
- *  All rights reserved. ARM DDI 0406C.c (ID051414)
- */
-
-#ifndef __ARCH_ARM_SRC_ARMV7_R_SCTLR_H
-#define __ARCH_ARM_SRC_ARMV7_R_SCTLR_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <arch/barriers.h>
-#include <arch/irq.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Vector Base Address Register (VBAR) */
-
-#define VBAR_MASK                (0xffffffe0)
-
-/* CP15 c0 Registers ********************************************************/
-
-/* Main ID Register (MIDR): CRn=c0, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Cache Type Register (CTR): CRn=c0, opc1=0, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* TCM Type Register (TCMTR): CRn=c0, opc1=0, CRm=c0, opc2=2
- * Details implementation defined.
- */
-
-/* Aliases of Main ID register (MIDR): CRn=c0, opc1=0, CRm=c0, opc2=3,7
- * TODO: To be provided
- */
-
-/* MPU Type Register (MPUIR): CRn=c0, opc1=0, CRm=c0, opc2=4
- * TODO: To be provided
- */
-
-/* Revision ID Register (REVIDR): CRn=c0, opc1=0, CRm=c0, opc2=6
- * TODO: To be provided
- */
-
-/* Processor Feature Register 0 (ID_PFR0): CRn=c0, opc1=0, CRm=c1, opc2=0
- * Processor Feature Register 1 (ID_PFR1): CRn=c0, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* Debug Feature Register 0 (ID_DFR0): CRn=c0, opc1=0, CRm=c1, opc2=2
- * TODO: To be provided
- */
-
-/* Auxiliary Feature Register 0 (ID_AFR0): CRn=c0, opc1=0, CRm=c1, opc2=3
- * TODO: To be provided
- */
-
-/* Memory Model Features Register 0 (ID_MMFR0):
- * CRn=c0, opc1=0, CRm=c1, opc2=4
- * Memory Model Features Register 1 (ID_MMFR1):
- * CRn=c0, opc1=0, CRm=c1, opc2=5
- * Memory Model Features Register 2 (ID_MMFR2):
- * CRn=c0, opc1=0, CRm=c1, opc2=6
- * Memory Model Features Register 3 (ID_MMFR3):
- * CRn=c0, opc1=0, CRm=c1, opc2=7
- * TODO: To be provided
- */
-
-/* Instruction Set Attributes Register 0 (ID_ISAR0):
- * CRn=c0, opc1=0, CRm=c2, opc2=0
- * Instruction Set Attributes Register 1 (ID_ISAR1):
- * CRn=c0, opc1=0, CRm=c2, opc2=1
- * Instruction Set Attributes Register 2 (ID_ISAR2):
- * CRn=c0, opc1=0, CRm=c2, opc2=2
- * Instruction Set Attributes Register 3 (ID_ISAR3):
- * CRn=c0, opc1=0, CRm=c2, opc2=3
- * Instruction Set Attributes Register 4 (ID_ISAR4):
- * CRn=c0, opc1=0, CRm=c2, opc2=4
- * Instruction Set Attributes Register 5 (ID_ISAR5):
- * CRn=c0, opc1=0, CRm=c2, opc2=5
- * Instruction Set Attributes Register 6-7 (ID_ISAR6-7).
- *  Reserved.
- * TODO: Others to be provided
- */
-
-/* Reserved: CRn=c0, opc1=0, CRm=c3-c7, opc2=* */
-
-/* Cache Size Identification Register (CCSIDR):
- * CRn=c0, opc1=1, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Cache Level ID Register (CLIDR): CRn=c0, opc1=1, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* Auxiliary ID Register (AIDR): CRn=c0, opc1=1, CRm=c0, opc2=7
- * TODO: To be provided
- */
-
-/* Cache Size Selection Register (CSSELR): CRn=c0, opc1=2, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* CP15 c1 Registers ********************************************************/
-
-/* System Control Register (SCTLR): CRn=c1, opc1=0, CRm=c0, opc2=0
- */
-
-#define SCTLR_M            (1 << 0)  /* Bit 0:  MPU enable bit */
-#define SCTLR_A            (1 << 1)  /* Bit 1:  Enables strict alignment of 
data */
-#define SCTLR_C            (1 << 2)  /* Bit 2:  Determines if data can be 
cached */
-                                     /* Bits 3-4: Reserved */
-#define SCTLR_CCP15BEN     (1 << 5)  /* Bit 5:  CP15 barrier enable */
-                                     /* Bit 6:  Reserved */
-#define SCTLR_B            (1 << 7)  /* Bit 7:  Should be zero on ARMv7-R */
-                                     /* Bits 8-9: Reserved */
-#define SCTLR_SW           (1 << 10) /* Bit 10: SWP/SWPB Enable bit */
-#define SCTLR_Z            (1 << 11) /* Bit 11: Program flow prediction 
control */
-#define SCTLR_I            (1 << 12) /* Bit 12: Determines if instructions can 
be cached */
-#define SCTLR_V            (1 << 13) /* Bit 13: Vectors bit */
-#define SCTLR_RR           (1 << 14) /* Bit 14: Cache replacement strategy */
-                                     /* Bits 15-16: Reserved */
-#define SCTLR_BR           (1 << 17) /* Bit 17: Background Region bit */
-                                     /* Bit 18: Reserved */
-#define SCTLR_DZ           (1 << 19) /* Bit 19: Divide by Zero fault enable 
bit */
-                                     /* Bit 20: Reserved */
-#define SCTLR_FI           (1 << 21) /* Bit 21: Fast interrupts configuration 
enable bit */
-#define SCTLR_U            (1 << 22) /* Bit 22: Unaligned access model (always 
one) */
-#define SCTLR_VE           (1 << 24) /* Bit 24: Interrupt Vectors Enable bit */
-#define SCTLR_EE           (1 << 25) /* Bit 25: Determines the value the 
CPSR.E */
-#define SCTLR_NMFI         (1 << 27) /* Bit 27: Non-maskable FIQ (NMFI) 
support */
-                                     /* Bits 28-29: Reserved */
-#define SCTLR_TE           (1 << 30) /* Bit 30: Thumb exception enable */
-
-/* Auxiliary Control Register (ACTLR): CRn=c1, opc1=0, CRm=c0, opc2=1 */
-
-#define ACTLR_FW                 (1 << 0)  /* Bit 0: Enable Cache/TLB 
maintenance broadcast */
-                                           /* Bits 1-2: Reserved */
-#define ACTLR_MRP                (1 << 3)  /* Bit 3: Enable MRP */
-                                           /* Bits 4-5: Reserved */
-#define ACTLR_SMP                (1 << 6)  /* Bit 6: Cortex-A9 taking part in 
coherency */
-                                           /* Bits 7: Reserved */
-#define ACTLR_ALLOC_1WAY         (1 << 8)  /* Bit 8: Allocation in 1-way cache 
only */
-#define ACTLR_DTCM_ECC           (1 << 9)  /* Bit 9: ECC on caches and DTCM */
-#define ACTLR_ITCM_ECC           (1 << 10) /* Bit 10: ECC on caches and ITCM */
-#define ACTLR_ITCM_QOS           (1 << 11) /* Bit 11: Enable QoS*/
-                                           /* Bits 12-31: Reserved */
-
-/* Coprocessor Access Control Register (CPACR):
- * CRn=c1, opc1=0, CRm=c0, opc2=2
- * TODO: To be provided
- */
-
-/* CP15 c2-c4 Registers *****************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c5 Registers ********************************************************/
-
-/* Data Fault Status Register (DFSR): CRn=c5, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Instruction Fault Status Register (IFSR): CRn=c5, opc1=0, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* Auxiliary DFSR (ADFSR): CRn=c5, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* Auxiliary IFSR (AIFSR): CRn=c5, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* CP15 c6 Registers ********************************************************/
-
-/* Data Fault Address Register(DFAR): CRn=c6, opc1=0, CRm=c0, opc2=0
- *
- *   Holds the MVA of the faulting address when a synchronous fault occurs
- */
-
-/* Instruction Fault Address Register(IFAR): CRn=c6, opc1=0, CRm=c0, opc2=1
- *
- *   Holds the MVA of the faulting address of the instruction that caused a
- *   prefetch abort.
- */
-
-/* Data Region Base Address Register (DRBAR): CRn=c6, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* Instruction Region Base Address Register (IRBAR):
- * CRn=c6, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* Data Region Size and Enable Register (DRSR):
- * CRn=c6, opc1=0, CRm=c1, opc2=2
- * TODO: To be provided
- */
-
-/* Instruction Region Size and Enable Register (IRSR):
- * CRn=c6, opc1=0, CRm=c1, opc2=3
- * TODO: To be provided
- */
-
-/* Data Region Access Control Register (DRACR):
- * CRn=c6, opc1=0, CRm=c1, opc2=4
- * TODO: To be provided
- */
-
-/* Instruction Region Access Control Register (IRACR):
- * CRn=c6, opc1=0, CRm=c1, opc2=5
- * TODO: To be provided
- */
-
-/* MPU Region Number Register (RGNR):
- * CRn=c6, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* CP15 c7 Registers ********************************************************/
-
-/* See cp15_cacheops.h */
-
-/* CP15 c8 Registers ********************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c9 Registers ********************************************************/
-
-/* 32-bit Performance Monitors Control Register (PMCR):
- * CRn=c9, opc1=0, CRm=c12, opc2=0
- */
-
-#define PMCR_E             (1 << 0)  /* Enable all counters */
-#define PMCR_P             (1 << 1)  /* Reset all counter events (except 
PMCCNTR) */
-#define PMCR_C             (1 << 2)  /* Reset cycle counter (PMCCNTR) to zero 
*/
-#define PMCR_D             (1 << 3)  /* Enable cycle counter clock (PMCCNTR) 
divider */
-#define PMCR_X             (1 << 4)  /* Export of events is enabled */
-#define PMCR_DP            (1 << 5)  /* Disable PMCCNTR if event counting is 
prohibited */
-#define PMCR_N_SHIFT       (11)      /* Bits 11-15:  Number of event counters 
*/
-#define PMCR_N_MASK        (0x1f << PMCR_N_SHIFT)
-#define PMCR_IDCODE_SHIFT  (16)      /* Bits 16-23: Identification code */
-#define PMCR_IDCODE_MASK   (0xff << PMCR_IDCODE_SHIFT)
-#define PMCR_IMP_SHIFT     (24)      /* Bits 24-31: Implementer code */
-#define PMCR_IMP_MASK      (0xff << PMCR_IMP_SHIFT)
-
-/* 32-bit Performance Monitors Count Enable Set register (PMCNTENSET):
- * CRn=c9, opc1=0, CRm=c12, opc2=1
- */
-
-#define PMCESR_CCES        (1 << 31) /* Bits 31: Count Enable Set Register */
-
-/* 32-bit Performance Monitors Count Enable Clear register (PMCNTENCLR):
- * CRn=c9, opc1=0, CRm=c12, opc2=2
- */
-
-#define PMCECR_CCEC        (1 << 31) /* Bits 31: Count Enable Clear Register */
-
-/* 32-bit Performance Monitors Overflow Flag Status Register (PMOVSR):
- * CRn=c9, opc1=0, CRm=c12, opc2=3
- */
-
-#define PMOFSR_COF0        (1 << 0)  /* Bits  0: Counter 0 overflow flag */
-#define PMOFSR_COF1        (1 << 1)  /* Bits  1: Counter 1 overflow flag */
-#define PMOFSR_COF2        (1 << 2)  /* Bits  2: Counter 2 overflow flag */
-#define PMOFSR_COF3        (1 << 3)  /* Bits  3: Counter 3 overflow flag */
-#define PMOFSR_COF4        (1 << 4)  /* Bits  4: Counter 4 overflow flag */
-#define PMOFSR_COF5        (1 << 5)  /* Bits  5: Counter 5 overflow flag */
-#define PMOFSR_CCOF        (1 << 31) /* Bits 31: Cycle counter overflow flag */
-
-/* 32-bit Performance Monitors Software Increment register (PMSWINC):
- * CRn=c9, opc1=0, CRm=c12, opc2=4
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Event Counter Selection Register (PMSELR):
- * CRn=c9, opc1=0, CRm=c12, opc2=5
- */
-
-#define PMECSR_CS_MASK     (0x1f)    /* Bits 0-5: Counter select */
-
-/* 32-bit Performance Monitors Common Event Identification (PMCEID0):
- * CRn=c9, opc1=0, CRm=c12, opc2=6
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Common Event Identification (PMCEID1):
- * CRn=c9, opc1=0, CRm=c12, opc2=7
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Cycle Count Register (PMCCNTR):
- * CRn=c9, opc1=0, CRm=c13, opc2=0
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Event Type Select Register (PMETSR):
- * CRn=c9, opc1=0, CRm=c13, opc2=1
- */
-
-#define PMETSR_L1_IC_FILL             (0x1)  /* Level 1 instruction cache 
refill */
-#define PMETSR_L1_ITLB_FILL           (0x2)  /* Level 1 instruction TLB refill 
*/
-#define PMETSR_L1_DC_FILL             (0x3)  /* Level 1 data cache refill */
-#define PMETSR_L1_DC_ACC              (0x4)  /* Level 1 data cache access */
-#define PMETSR_L1_DTLB_FILL           (0x5)  /* Level 1 data TLB refill */
-#define PMETSR_LOAD                   (0x6)  /* Data read architecturally 
executed */
-#define PMETSR_STORE                  (0x7)  /* Data write architecturally 
executed */
-#define PMETSR_INSTARCHEXEC           (0x8)  /* Instruction architecturally 
executed */
-#define PMETSR_EXCEPETIONTAKEN        (0x9)  /* Exception taken */
-#define PMETSR_EXCEPETIONRET          (0xa)  /* Exception return */
-#define PMETSR_WRCONTEXTIDR           (0xb)  /* Write to CONTEXTIDR */
-#define PMETSR_SOFTPCCHANGE           (0xc)  /* Software change of the PC */
-#define PMETSR_IMMBR                  (0xd)  /* Immediate branch */
-#define PMETSR_PROCRET                (0xe)  /* Procedure return */
-#define PMETSR_UNALINGEDLDSTR         (0xf)  /* Unaligned load or store */
-#define PMETSR_MISPREDICTEDBRANCHEXEC (0x10) /* Mispredicted or not predicted 
branch speculatively executed */
-#define PMETSR_PREDICTEDBRANCHEXEC    (0x12) /* Predictable branch 
speculatively executed */
-#define PMETSR_DATAMEMACC             (0x13) /* Data memory access. */
-#define PMETSR_ICACC                  (0x14) /* Instruction Cache access. */
-#define PMETSR_DCEVICTION             (0x15) /* Data cache eviction. */
-#define PMETSR_IRQEXCEPTION           (0x86) /* IRQ exception taken. */
-#define PMETSR_FIQEXCEPTION           (0x87) /* FIQ exception taken. */
-#define PMETSR_EXTMEMREQ              (0xc0) /* External memory request. */
-#define PMETSR_NCEXTMEMREQ            (0xc1) /* Non-cacheable external memory 
request */
-#define PMETSR_PREFETCHLINEFILL       (0xc2) /* Linefill because of prefetch. 
*/
-#define PMETSR_PREFETCHLINEDROP       (0xc3) /* Prefetch linefill dropped. */
-#define PMETSR_ENTERINGRAMODE         (0xc4) /* Entering read allocate mode. */
-#define PMETSR_RAMODE                 (0xc5) /* Read allocate mode. */
-#define PMETSR_RESERVED               (0xc6) /* Reserved, do not use */
-#define PMETSR_DWSTALLSBFFULL         (0xc9) /* Data Write operation that 
stalls the pipeline because the store buffer is full. */
-#define PMETSR_EVENT_MASK             (0xff)
-
-/* 32-bit Performance Monitors Event Count Register (PMXEVCNTR):
- * CRn=c9, opc1=0, CRm=c13, opc2=2
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors User Enable Register (PMUSERENR):
- * CRn=c9, opc1=0, CRm=c14, opc2=0
- */
-
-#define PMUER_UME_SHIFT      (0)       /* Bits 0: User mode enable */
-#define PMUER_UME            (1 << PMUER_UME_SHIFT)
-
-/* 32-bit Performance Monitors Interrupt Enable Set register (PMINTENSET):
- * CRn=c9, opc1=0, CRm=c14, opc2=1
- */
-
-#define PMIESR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIESR_CCNTOIE       (1 << PMIESR_CCNTOIE_SHIFT)
-
-/* 32-bit Performance Monitors Interrupt Enable Clear register (PMINTENCLR):
- * CRn=c9, opc1=0, CRm=c14, opc2=2
- */
-
-#define PMIECR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIECR_CCNTOIE       (1 << PMIECR_CCNTOIE_SHIFT)
-
-/* CP15 c10 Registers *******************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c11 Registers *******************************************************/
-
-/* Reserved for implementation defined DMA functions */
-
-/* CP15 c12 Registers *******************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c13 Registers *******************************************************/
-
-/* Context ID Register (CONTEXTIDR): CRn=c13, opc1=0, CRm=c0, opc2=1
- * 32-Bit ContextID value.
- */
-
-/* User Read/Write (TPIDRURW): CRn=c13, opc1=0, CRm=c0, opc2=2
- * TODO: To be provided
- */
-
-/* User Read Only (TPIDRURO): CRn=c13, opc1=0, CRm=c0, opc2=3
- * TODO: To be provided
- */
-
-/* PL1 only (TPIDRPRW): CRn=c13, opc1=0, CRm=c0, opc2=4
- * TODO: To be provided
- */
-
-/* CP15 c14 Registers *******************************************************/
-
-/* Counter Frequency register (CNTFRQ): CRn=c14, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Timer PL1 Control register (CNTKCTL): CRn=c14, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* PL1 Physical TimerValue register (CNTP_TVAL):
- * CRn=c14, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* PL1 Physical Timer Control register (CNTP_CTL):
- * CRn=c14, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* Virtual TimerValue register (CNTV_TVAL): CRn=c14, opc1=0, CRm=c3, opc2=0
- * TODO: To be provided
- */
-
-/* Virtual Timer Control register (CNTV_CTL): CRn=c14, opc1=0, CRm=c3, opc2=0
- * TODO: To be provided
- */
-
-/* 64-bit Physical Count register (CNTPCT): CRn=c14, opc1=0, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* Virtual Count register (CNTVCT): CRn=c14, opc1=1, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* PL1 Physical Timer CompareValue register (CNTP_CVAL):
- * CRn=c14, opc1=2, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* Virtual Timer CompareValue register (CNTV_CVAL):
- * CRn=c14, opc1=3, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* CP15 c15 Registers *******************************************************/
-
-/* Implementation defined */
-
-/****************************************************************************
- * Assembly Macros
- ****************************************************************************/
-
-#ifdef __ASSEMBLY__
-
-/* Get the device ID */
-
-.macro cp15_rdid, id
-  mrc p15, 0, \id, c0, c0, 0
-.endm
-
-/* Read/write the system control register (SCTLR) */
-
-.macro cp15_rdsctlr, sctlr
-  mrc p15, 0, \sctlr, c1, c0, 0
-.endm
-
-.macro cp15_wrsctlr, sctlr
-  mcr p15, 0, \sctlr, c1, c0, 0
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-.endm
-#endif /* __ASSEMBLY__ */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/* Get the device ID register */
-
-static inline unsigned int cp15_rdid(void)
-{
-  return CP15_GET(MIDR);
-}
-
-/* Read/write the system control register (SCTLR) */
-
-static inline unsigned int cp15_rdsctlr(void)
-{
-  return CP15_GET(SCTLR);
-}
-
-static inline void cp15_wrsctlr(unsigned int sctlr)
-{
-  CP15_SET(SCTLR, sctlr);
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-}
-
-/* Read/write the vector base address register (VBAR) */
-
-static inline unsigned int cp15_rdvbar(void)
-{
-  return CP15_GET(VBAR);
-}
-
-static inline void cp15_wrvbar(unsigned int vbar)
-{
-  CP15_SET(VBAR, vbar);
-}
-
-/* Read/write the implementation defined Auxiliary Control Register (ACTLR) */
-
-static inline unsigned int cp15_rdactlr(void)
-{
-  return CP15_GET(ACTLR);
-}
-
-static inline void cp15_wractlr(unsigned int actlr)
-{
-  CP15_SET(ACTLR, actlr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdpmcr/cp15_pmu_wrpmcr/cp15_pmu_pmcr
- *
- * Description:
- *   Read/Write the Performance Monitor Control Register (PMCR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdpmcr(void)
-{
-  return CP15_GET(PMCR);
-}
-
-static inline void cp15_pmu_wrpmcr(unsigned int pmcr)
-{
-  CP15_SET(PMCR, pmcr);
-}
-
-static inline void cp15_pmu_pmcr(unsigned int pmcr)
-{
-  cp15_pmu_wrpmcr(pmcr | cp15_pmu_rdpmcr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcesr/cp15_pmu_wrcesr/cp15_pmu_cesr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Count Enable Set register (PMCNTENSET)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdcesr(void)
-{
-  return CP15_GET(PMCNTENSET);
-}
-
-static inline void cp15_pmu_wrcesr(unsigned int cesr)
-{
-  CP15_SET(PMCNTENSET, cesr);
-}
-
-static inline void cp15_pmu_cesr(unsigned int cesr)
-{
-  cp15_pmu_wrcesr(cesr | cp15_pmu_rdcesr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcecr/cp15_pmu_wrcecr/cp15_pmu_cecr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Count Enable Clear register (PMCNTENCLR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdcecr(void)
-{
-  return CP15_GET(PMCNTENCLR);
-}
-
-static inline void cp15_pmu_wrcecr(unsigned int cecr)
-{
-  CP15_SET(PMCNTENCLR, cecr);
-}
-
-static inline void cp15_pmu_cecr(unsigned int cecr)
-{
-  cp15_pmu_wrcecr(cecr | cp15_pmu_rdcecr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcecr/cp15_pmu_wrcecr/cp15_pmu_cecr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Overflow Flag Status Register (PMOVSR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdofsr(void)
-{
-  return CP15_GET(PMOVSR);
-}
-
-static inline void cp15_pmu_wrofsr(unsigned int ofsr)
-{
-  CP15_SET(PMOVSR, ofsr);
-}
-
-static inline void cp15_pmu_ofsr(unsigned int ofsr)
-{
-  cp15_pmu_wrofsr(ofsr | cp15_pmu_rdofsr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdsir/cp15_pmu_wrsir/cp15_pmu_sir
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Software Increment register (PMSWINC)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdsir(void)
-{
-  return CP15_GET(PMSWINC);
-}
-
-static inline void cp15_pmu_wrsir(unsigned int sir)
-{
-  CP15_SET(PMSWINC, sir);
-}
-
-static inline void cp15_pmu_sir(unsigned int sir)
-{
-  cp15_pmu_wrsir(sir | cp15_pmu_rdsir());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wrecsr
- *
- * Description:
- *   Write the Performance Monitors Event Counter Selection Register (PMSELR)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wrecsr(unsigned int ecsr)
-{
-  CP15_SET(PMSELR, ecsr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wretsr
- *
- * Description:
- *   Write the Performance Monitors Event Type Select Register (PMXEVTYPER)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wretsr(unsigned int etsr)
-{
-  CP15_SET(PMXEVTYPER, etsr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wruer
- *
- * Description:
- *   Write the Performance Monitors User Enable Register (PMUSERENR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rduer(void)
-{
-  return CP15_GET(PMUSERENR);
-}
-
-static inline void cp15_pmu_wruer(unsigned int uer)
-{
-  CP15_SET(PMUSERENR, uer);
-}
-
-static inline void cp15_pmu_uer(unsigned int uer)
-{
-  cp15_pmu_wruer(uer | cp15_pmu_rduer());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wriesr
- *
- * Description:
- *   Write the Performance Monitors
- *   Interrupt Enable Set register (PMINTENSET)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wriesr(unsigned int iesr)
-{
-  CP15_SET(PMINTENSET, iesr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wriecr
- *
- * Description:
- *   Write the Performance Monitors
- *   Interrupt Enable Clear register (PMINTENCLR)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wriecr(unsigned int iecr)
-{
-  CP15_SET(PMINTENCLR, iecr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdccr
- *
- * Description:
- *   Read the Performance Monitors Cycle Count Register (PMCCNTR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdccr(void)
-{
-  return CP15_GET(PMCCNTR);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdecr
- *
- * Description:
- *   Read the Performance Monitors Event Count Register (PMXEVCNTR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdecr(void)
-{
-  return CP15_GET(PMXEVCNTR);
-}
-
-#endif /* __ASSEMBLY__ */
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ARCH_ARM_SRC_ARMV7_R_SCTLR_H */
diff --git a/arch/arm/src/armv8-r/sctlr.h b/arch/arm/src/armv8-r/sctlr.h
deleted file mode 100644
index 17e7381cf02..00000000000
--- a/arch/arm/src/armv8-r/sctlr.h
+++ /dev/null
@@ -1,846 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv8-r/sctlr.h
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/* References:
- *
- *  "ARM Architecture Reference Manual, ARMv7-A and ARMv7-R edition",
- *  Copyright 1996-1998, 2000, 2004-2012 ARM.
- *  All rights reserved. ARM DDI 0406C.c (ID051414)
- */
-
-#ifndef __ARCH_ARM_SRC_ARMV8_R_SCTLR_H
-#define __ARCH_ARM_SRC_ARMV8_R_SCTLR_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <arch/barriers.h>
-#include <arch/irq.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* CP15 c0 Registers ********************************************************/
-
-/* Main ID Register (MIDR): CRn=c0, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Cache Type Register (CTR): CRn=c0, opc1=0, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* TCM Type Register (TCMTR): CRn=c0, opc1=0, CRm=c0, opc2=2
- * Details implementation defined.
- */
-
-/* Aliases of Main ID register (MIDR): CRn=c0, opc1=0, CRm=c0, opc2=3,7
- * TODO: To be provided
- */
-
-/* MPU Type Register (MPUIR): CRn=c0, opc1=0, CRm=c0, opc2=4
- * TODO: To be provided
- */
-
-/* Revision ID Register (REVIDR): CRn=c0, opc1=0, CRm=c0, opc2=6
- * TODO: To be provided
- */
-
-/* Processor Feature Register 0 (ID_PFR0): CRn=c0, opc1=0, CRm=c1, opc2=0
- * Processor Feature Register 1 (ID_PFR1): CRn=c0, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* Debug Feature Register 0 (ID_DFR0): CRn=c0, opc1=0, CRm=c1, opc2=2
- * TODO: To be provided
- */
-
-/* Auxiliary Feature Register 0 (ID_AFR0): CRn=c0, opc1=0, CRm=c1, opc2=3
- * TODO: To be provided
- */
-
-/* Memory Model Features Register 0 (ID_MMFR0):
- * CRn=c0, opc1=0, CRm=c1, opc2=4
- * Memory Model Features Register 1 (ID_MMFR1):
- * CRn=c0, opc1=0, CRm=c1, opc2=5
- * Memory Model Features Register 2 (ID_MMFR2):
- * CRn=c0, opc1=0, CRm=c1, opc2=6
- * Memory Model Features Register 3 (ID_MMFR3):
- * CRn=c0, opc1=0, CRm=c1, opc2=7
- * TODO: To be provided
- */
-
-/* Instruction Set Attributes Register 0 (ID_ISAR0):
- * CRn=c0, opc1=0, CRm=c2, opc2=0
- * Instruction Set Attributes Register 1 (ID_ISAR1):
- * CRn=c0, opc1=0, CRm=c2, opc2=1
- * Instruction Set Attributes Register 2 (ID_ISAR2):
- * CRn=c0, opc1=0, CRm=c2, opc2=2
- * Instruction Set Attributes Register 3 (ID_ISAR3):
- * CRn=c0, opc1=0, CRm=c2, opc2=3
- * Instruction Set Attributes Register 4 (ID_ISAR4):
- * CRn=c0, opc1=0, CRm=c2, opc2=4
- * Instruction Set Attributes Register 5 (ID_ISAR5):
- * CRn=c0, opc1=0, CRm=c2, opc2=5
- * Instruction Set Attributes Register 6-7 (ID_ISAR6-7).
- *  Reserved.
- * TODO: Others to be provided
- */
-
-/* Reserved: CRn=c0, opc1=0, CRm=c3-c7, opc2=* */
-
-/* Cache Size Identification Register (CCSIDR):
- * CRn=c0, opc1=1, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Cache Level ID Register (CLIDR): CRn=c0, opc1=1, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* Auxiliary ID Register (AIDR): CRn=c0, opc1=1, CRm=c0, opc2=7
- * TODO: To be provided
- */
-
-/* Cache Size Selection Register (CSSELR): CRn=c0, opc1=2, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* CP15 c1 Registers ********************************************************/
-
-/* System Control Register (SCTLR): CRn=c1, opc1=0, CRm=c0, opc2=0
- */
-
-#define SCTLR_M            (1 << 0)  /* Bit 0:  MPU enable bit */
-#define SCTLR_A            (1 << 1)  /* Bit 1:  Enables strict alignment of 
data */
-#define SCTLR_C            (1 << 2)  /* Bit 2:  Determines if data can be 
cached */
-                                     /* Bits 3-4: Reserved */
-#define SCTLR_CCP15BEN     (1 << 5)  /* Bit 5:  CP15 barrier enable */
-                                     /* Bit 6:  Reserved */
-#define SCTLR_B            (1 << 7)  /* Bit 7:  Should be zero on ARMv7-R */
-                                     /* Bits 8-9: Reserved */
-#define SCTLR_SW           (1 << 10) /* Bit 10: SWP/SWPB Enable bit */
-#define SCTLR_Z            (1 << 11) /* Bit 11: Program flow prediction 
control */
-#define SCTLR_I            (1 << 12) /* Bit 12: Determines if instructions can 
be cached */
-#define SCTLR_V            (1 << 13) /* Bit 13: Vectors bit */
-#define SCTLR_RR           (1 << 14) /* Bit 14: Cache replacement strategy */
-                                     /* Bits 15-16: Reserved */
-#define SCTLR_BR           (1 << 17) /* Bit 17: Background Region bit */
-                                     /* Bit 18: Reserved */
-#define SCTLR_DZ           (1 << 19) /* Bit 19: Divide by Zero fault enable 
bit */
-                                     /* Bit 20: Reserved */
-#define SCTLR_FI           (1 << 21) /* Bit 21: Fast interrupts configuration 
enable bit */
-#define SCTLR_U            (1 << 22) /* Bit 22: Unaligned access model (always 
one) */
-#define SCTLR_VE           (1 << 24) /* Bit 24: Interrupt Vectors Enable bit */
-#define SCTLR_EE           (1 << 25) /* Bit 25: Determines the value the 
CPSR.E */
-#define SCTLR_NMFI         (1 << 27) /* Bit 27: Non-maskable FIQ (NMFI) 
support */
-                                     /* Bits 28-29: Reserved */
-#define SCTLR_TE           (1 << 30) /* Bit 30: Thumb exception enable */
-
-/* Hyp Auxiliary Control Register */
-
-#define HACTLR_CPUACTLR         (1 << 0)  /* Bit 0: Enable write access 
IMP_CPUACTLR from EL1 */
-#define HACTLR_CDBGDCI          (1 << 1)  /* Bit 1: Enable access CDBGDCI from 
EL1 */
-                                          /* Bits 2-6: Reserved */
-#define HACTLR_FLASHIFREGIONR   (1 << 7)  /* Bit 7: Enable access 
IMP_FLASHIFREGIONR from EL1 */
-#define HACTLR_PERIPHPREGIONR   (1 << 8)  /* Bit 8: Enable access 
IMP_PERIPHPREGIONR from EL1 */
-#define HACTLR_QOSR_BIT         (1 << 9)  /* Bit 9: Enable access QOSR from 
EL1 */
-#define HACTLR_BUSTIMEOUTR_BIT  (1 << 10) /* Bit 10: Enable access 
IMP_BUSTIMEOUTR from EL1 */
-                                          /* Bit 11: Reserved */
-#define HACTLR_INTMONR_BIT      (1 << 12) /* Bit 12: Enable access IMP_INTMONR 
from EL1 */
-#define HACTLR_ERR_BIT          (1 << 13) /* Bit 13: Enable access IMP_*ERR 
registers from EL1 */
-                                          /* Bit 14: Reserved */
-#define HACTLR_TESTR1_BIT       (1 << 15) /* Bit 15: Enable access IMP_TESTR1 
registers from EL0 and EL1 */
-                                          /* Bits 16-31: Reserved */
-
-/* Enable all IMP DEF registers access from EL1 except for TESTR1 */
-
-#define HACTLR_INIT             (HACTLR_ERR_BIT | HACTLR_INTMONR_BIT | \
-                                 HACTLR_BUSTIMEOUTR_BIT | HACTLR_QOSR_BIT | \
-                                 HACTLR_PERIPHPREGIONR | HACTLR_FLASHIFREGIONR 
| \
-                                 HACTLR_CDBGDCI | HACTLR_CPUACTLR)
-
-/* Auxiliary Control Register (ACTLR): CRn=c1, opc1=0, CRm=c0, opc2=1 */
-
-#define ACTLR_FW                 (1 << 0)  /* Bit 0: Enable Cache/TLB 
maintenance broadcast */
-                                           /* Bits 1-2: Reserved */
-#define ACTLR_MRP                (1 << 3)  /* Bit 3: Enable MRP */
-                                           /* Bits 4-5: Reserved */
-#define ACTLR_SMP                (1 << 6)  /* Bit 6: Cortex-A9 taking part in 
coherency */
-                                           /* Bits 7: Reserved */
-#define ACTLR_ALLOC_1WAY         (1 << 8)  /* Bit 8: Allocation in 1-way cache 
only */
-#define ACTLR_DTCM_ECC           (1 << 9)  /* Bit 9: ECC on caches and DTCM */
-#define ACTLR_ITCM_ECC           (1 << 10) /* Bit 10: ECC on caches and ITCM */
-#define ACTLR_ITCM_QOS           (1 << 11) /* Bit 11: Enable QoS*/
-                                           /* Bits 12-31: Reserved */
-
-/* Coprocessor Access Control Register (CPACR):
- * CRn=c1, opc1=0, CRm=c0, opc2=2
- * TODO: To be provided
- */
-
-/* CP15 c2-c4 Registers *****************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c5 Registers ********************************************************/
-
-/* Data Fault Status Register (DFSR): CRn=c5, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Instruction Fault Status Register (IFSR): CRn=c5, opc1=0, CRm=c0, opc2=1
- * TODO: To be provided
- */
-
-/* Auxiliary DFSR (ADFSR): CRn=c5, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* Auxiliary IFSR (AIFSR): CRn=c5, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* CP15 c6 Registers ********************************************************/
-
-/* Data Fault Address Register(DFAR): CRn=c6, opc1=0, CRm=c0, opc2=0
- *
- *   Holds the MVA of the faulting address when a synchronous fault occurs
- */
-
-/* Instruction Fault Address Register(IFAR): CRn=c6, opc1=0, CRm=c0, opc2=1
- *
- *   Holds the MVA of the faulting address of the instruction that caused a
- *   prefetch abort.
- */
-
-/* Data Region Base Address Register (DRBAR): CRn=c6, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* Instruction Region Base Address Register (IRBAR):
- * CRn=c6, opc1=0, CRm=c1, opc2=1
- * TODO: To be provided
- */
-
-/* Data Region Size and Enable Register (DRSR):
- * CRn=c6, opc1=0, CRm=c1, opc2=2
- * TODO: To be provided
- */
-
-/* Instruction Region Size and Enable Register (IRSR):
- * CRn=c6, opc1=0, CRm=c1, opc2=3
- * TODO: To be provided
- */
-
-/* Data Region Access Control Register (DRACR):
- * CRn=c6, opc1=0, CRm=c1, opc2=4
- * TODO: To be provided
- */
-
-/* Instruction Region Access Control Register (IRACR):
- * CRn=c6, opc1=0, CRm=c1, opc2=5
- * TODO: To be provided
- */
-
-/* MPU Region Number Register (RGNR):
- * CRn=c6, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* CP15 c7 Registers ********************************************************/
-
-/* See cp15_cacheops.h */
-
-/* CP15 c8 Registers ********************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c9 Registers ********************************************************/
-
-/* 32-bit Performance Monitors Control Register (PMCR):
- * CRn=c9, opc1=0, CRm=c12, opc2=0
- */
-
-#define PMCR_E             (1 << 0)  /* Enable all counters */
-#define PMCR_P             (1 << 1)  /* Reset all counter events (except 
PMCCNTR) */
-#define PMCR_C             (1 << 2)  /* Reset cycle counter (PMCCNTR) to zero 
*/
-#define PMCR_D             (1 << 3)  /* Enable cycle counter clock (PMCCNTR) 
divider */
-#define PMCR_X             (1 << 4)  /* Export of events is enabled */
-#define PMCR_DP            (1 << 5)  /* Disable PMCCNTR if event counting is 
prohibited */
-#define PMCR_N_SHIFT       (11)      /* Bits 11-15:  Number of event counters 
*/
-#define PMCR_N_MASK        (0x1f << PMCR_N_SHIFT)
-#define PMCR_IDCODE_SHIFT  (16)      /* Bits 16-23: Identification code */
-#define PMCR_IDCODE_MASK   (0xff << PMCR_IDCODE_SHIFT)
-#define PMCR_IMP_SHIFT     (24)      /* Bits 24-31: Implementer code */
-#define PMCR_IMP_MASK      (0xff << PMCR_IMP_SHIFT)
-
-/* 32-bit Performance Monitors Count Enable Set register (PMCNTENSET):
- * CRn=c9, opc1=0, CRm=c12, opc2=1
- */
-
-#define PMCESR_CCES        (1 << 31) /* Bits 31: Count Enable Set Register */
-
-/* 32-bit Performance Monitors Count Enable Clear register (PMCNTENCLR):
- * CRn=c9, opc1=0, CRm=c12, opc2=2
- */
-
-#define PMCECR_CCEC        (1 << 31) /* Bits 31: Count Enable Clear Register */
-
-/* 32-bit Performance Monitors Overflow Flag Status Register (PMOVSR):
- * CRn=c9, opc1=0, CRm=c12, opc2=3
- */
-
-#define PMOFSR_COF0        (1 << 0)  /* Bits  0: Counter 0 overflow flag */
-#define PMOFSR_COF1        (1 << 1)  /* Bits  1: Counter 1 overflow flag */
-#define PMOFSR_COF2        (1 << 2)  /* Bits  2: Counter 2 overflow flag */
-#define PMOFSR_COF3        (1 << 3)  /* Bits  3: Counter 3 overflow flag */
-#define PMOFSR_COF4        (1 << 4)  /* Bits  4: Counter 4 overflow flag */
-#define PMOFSR_COF5        (1 << 5)  /* Bits  5: Counter 5 overflow flag */
-#define PMOFSR_CCOF        (1 << 31) /* Bits 31: Cycle counter overflow flag */
-
-/* 32-bit Performance Monitors Software Increment register (PMSWINC):
- * CRn=c9, opc1=0, CRm=c12, opc2=4
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Event Counter Selection Register (PMSELR):
- * CRn=c9, opc1=0, CRm=c12, opc2=5
- */
-
-#define PMECSR_CS_MASK     (0x1f)    /* Bits 0-5: Counter select */
-
-/* 32-bit Performance Monitors Common Event Identification (PMCEID0):
- * CRn=c9, opc1=0, CRm=c12, opc2=6
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Common Event Identification (PMCEID1):
- * CRn=c9, opc1=0, CRm=c12, opc2=7
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Cycle Count Register (PMCCNTR):
- * CRn=c9, opc1=0, CRm=c13, opc2=0
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors Event Type Select Register (PMETSR):
- * CRn=c9, opc1=0, CRm=c13, opc2=1
- */
-
-#define PMETSR_L1_IC_FILL             (0x1)  /* Level 1 instruction cache 
refill */
-#define PMETSR_L1_ITLB_FILL           (0x2)  /* Level 1 instruction TLB refill 
*/
-#define PMETSR_L1_DC_FILL             (0x3)  /* Level 1 data cache refill */
-#define PMETSR_L1_DC_ACC              (0x4)  /* Level 1 data cache access */
-#define PMETSR_L1_DTLB_FILL           (0x5)  /* Level 1 data TLB refill */
-#define PMETSR_LOAD                   (0x6)  /* Data read architecturally 
executed */
-#define PMETSR_STORE                  (0x7)  /* Data write architecturally 
executed */
-#define PMETSR_INSTARCHEXEC           (0x8)  /* Instruction architecturally 
executed */
-#define PMETSR_EXCEPETIONTAKEN        (0x9)  /* Exception taken */
-#define PMETSR_EXCEPETIONRET          (0xa)  /* Exception return */
-#define PMETSR_WRCONTEXTIDR           (0xb)  /* Write to CONTEXTIDR */
-#define PMETSR_SOFTPCCHANGE           (0xc)  /* Software change of the PC */
-#define PMETSR_IMMBR                  (0xd)  /* Immediate branch */
-#define PMETSR_PROCRET                (0xe)  /* Procedure return */
-#define PMETSR_UNALINGEDLDSTR         (0xf)  /* Unaligned load or store */
-#define PMETSR_MISPREDICTEDBRANCHEXEC (0x10) /* Mispredicted or not predicted 
branch speculatively executed */
-#define PMETSR_PREDICTEDBRANCHEXEC    (0x12) /* Predictable branch 
speculatively executed */
-#define PMETSR_DATAMEMACC             (0x13) /* Data memory access. */
-#define PMETSR_ICACC                  (0x14) /* Instruction Cache access. */
-#define PMETSR_DCEVICTION             (0x15) /* Data cache eviction. */
-#define PMETSR_IRQEXCEPTION           (0x86) /* IRQ exception taken. */
-#define PMETSR_FIQEXCEPTION           (0x87) /* FIQ exception taken. */
-#define PMETSR_EXTMEMREQ              (0xc0) /* External memory request. */
-#define PMETSR_NCEXTMEMREQ            (0xc1) /* Non-cacheable external memory 
request */
-#define PMETSR_PREFETCHLINEFILL       (0xc2) /* Linefill because of prefetch. 
*/
-#define PMETSR_PREFETCHLINEDROP       (0xc3) /* Prefetch linefill dropped. */
-#define PMETSR_ENTERINGRAMODE         (0xc4) /* Entering read allocate mode. */
-#define PMETSR_RAMODE                 (0xc5) /* Read allocate mode. */
-#define PMETSR_RESERVED               (0xc6) /* Reserved, do not use */
-#define PMETSR_DWSTALLSBFFULL         (0xc9) /* Data Write operation that 
stalls the pipeline because the store buffer is full. */
-#define PMETSR_EVENT_MASK             (0xff)
-
-/* 32-bit Performance Monitors Event Count Register (PMXEVCNTR):
- * CRn=c9, opc1=0, CRm=c13, opc2=2
- * TODO: To be provided
- */
-
-/* 32-bit Performance Monitors User Enable Register (PMUSERENR):
- * CRn=c9, opc1=0, CRm=c14, opc2=0
- */
-
-#define PMUER_UME_SHIFT      (0)       /* Bits 0: User mode enable */
-#define PMUER_UME            (1 << PMUER_UME_SHIFT)
-
-/* 32-bit Performance Monitors Interrupt Enable Set register (PMINTENSET):
- * CRn=c9, opc1=0, CRm=c14, opc2=1
- */
-
-#define PMIESR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIESR_CCNTOIE       (1 << PMIESR_CCNTOIE_SHIFT)
-
-/* 32-bit Performance Monitors Interrupt Enable Clear register (PMINTENCLR):
- * CRn=c9, opc1=0, CRm=c14, opc2=2
- */
-
-#define PMIECR_CCNTOIE_SHIFT (31)    /* Bits 31: CCNT overflow interrupt 
enable. */
-#define PMIECR_CCNTOIE       (1 << PMIECR_CCNTOIE_SHIFT)
-
-/* CP15 c10 Registers *******************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c11 Registers *******************************************************/
-
-/* Reserved for implementation defined DMA functions */
-
-/* CP15 c12 Registers *******************************************************/
-
-/* Not used on ARMv7-R */
-
-/* CP15 c13 Registers *******************************************************/
-
-/* Context ID Register (CONTEXTIDR): CRn=c13, opc1=0, CRm=c0, opc2=1
- * 32-Bit ContextID value.
- */
-
-/* User Read/Write (TPIDRURW): CRn=c13, opc1=0, CRm=c0, opc2=2
- * TODO: To be provided
- */
-
-/* User Read Only (TPIDRURO): CRn=c13, opc1=0, CRm=c0, opc2=3
- * TODO: To be provided
- */
-
-/* PL1 only (TPIDRPRW): CRn=c13, opc1=0, CRm=c0, opc2=4
- * TODO: To be provided
- */
-
-/* CP15 c14 Registers *******************************************************/
-
-/* Counter Frequency register (CNTFRQ): CRn=c14, opc1=0, CRm=c0, opc2=0
- * TODO: To be provided
- */
-
-/* Timer PL1 Control register (CNTKCTL): CRn=c14, opc1=0, CRm=c1, opc2=0
- * TODO: To be provided
- */
-
-/* PL1 Physical TimerValue register (CNTP_TVAL):
- * CRn=c14, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* PL1 Physical Timer Control register (CNTP_CTL):
- * CRn=c14, opc1=0, CRm=c2, opc2=0
- * TODO: To be provided
- */
-
-/* Virtual TimerValue register (CNTV_TVAL): CRn=c14, opc1=0, CRm=c3, opc2=0
- * TODO: To be provided
- */
-
-/* Virtual Timer Control register (CNTV_CTL): CRn=c14, opc1=0, CRm=c3, opc2=0
- * TODO: To be provided
- */
-
-/* 64-bit Physical Count register (CNTPCT): CRn=c14, opc1=0, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* Virtual Count register (CNTVCT): CRn=c14, opc1=1, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* PL1 Physical Timer CompareValue register (CNTP_CVAL):
- * CRn=c14, opc1=2, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* Virtual Timer CompareValue register (CNTV_CVAL):
- * CRn=c14, opc1=3, CRm=c14, opc2=n
- * TODO: To be provided
- */
-
-/* CP15 c15 Registers *******************************************************/
-
-/* Implementation defined */
-
-/****************************************************************************
- * Assembly Macros
- ****************************************************************************/
-
-#ifdef __ASSEMBLY__
-
-/* Get the device ID */
-
-#ifdef __ghs__
-.macro cp15_rdid id
-  mrc p15, 0, id, c0, c0, 0
-.endm
-
-/* Read/write the system control register (SCTLR) */
-
-.macro cp15_rdsctlr sctlr
-  mrc p15, 0, sctlr, c1, c0, 0
-.endm
-
-.macro cp15_wrsctlr sctlr
-  mcr p15, 0, sctlr, c1, c0, 0
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-.endm
-#else
-.macro cp15_rdid, id
-  mrc p15, 0, \id, c0, c0, 0
-.endm
-
-/* Read/write the system control register (SCTLR) */
-
-.macro cp15_rdsctlr, sctlr
-  mrc p15, 0, \sctlr, c1, c0, 0
-.endm
-
-.macro cp15_wrsctlr, sctlr
-  mcr p15, 0, \sctlr, c1, c0, 0
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-  nop
-.endm
-#endif
-#endif /* __ASSEMBLY__ */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-
-/* Get the device ID register */
-
-static inline unsigned int cp15_rdid(void)
-{
-  return CP15_GET(MIDR);
-}
-
-/* Read/write the system control register (SCTLR) */
-
-static inline unsigned int cp15_rdsctlr(void)
-{
-  return CP15_GET(SCTLR);
-}
-
-static inline void cp15_wrsctlr(unsigned int sctlr)
-{
-  CP15_SET(SCTLR, sctlr);
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-  UP_NOP();
-}
-
-/* Read/write the vector base address register (VBAR) */
-
-static inline unsigned int cp15_rdvbar(void)
-{
-  return CP15_GET(VBAR);
-}
-
-static inline void cp15_wrvbar(unsigned int vbar)
-{
-  CP15_SET(VBAR, vbar);
-}
-
-/* Read/write the implementation defined Auxiliary Control Register (ACTLR) */
-
-static inline unsigned int cp15_rdactlr(void)
-{
-  return CP15_GET(ACTLR);
-}
-
-static inline void cp15_wractlr(unsigned int actlr)
-{
-  CP15_SET(ACTLR, actlr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdpmcr/cp15_pmu_wrpmcr/cp15_pmu_pmcr
- *
- * Description:
- *   Read/Write the Performance Monitor Control Register (PMCR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdpmcr(void)
-{
-  return CP15_GET(PMCR);
-}
-
-static inline void cp15_pmu_wrpmcr(unsigned int pmcr)
-{
-  CP15_SET(PMCR, pmcr);
-}
-
-static inline void cp15_pmu_pmcr(unsigned int pmcr)
-{
-  cp15_pmu_wrpmcr(pmcr | cp15_pmu_rdpmcr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcesr/cp15_pmu_wrcesr/cp15_pmu_cesr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Count Enable Set register (PMCNTENSET)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdcesr(void)
-{
-  return CP15_GET(PMCNTENSET);
-}
-
-static inline void cp15_pmu_wrcesr(unsigned int cesr)
-{
-  CP15_SET(PMCNTENSET, cesr);
-}
-
-static inline void cp15_pmu_cesr(unsigned int cesr)
-{
-  cp15_pmu_wrcesr(cesr | cp15_pmu_rdcesr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcecr/cp15_pmu_wrcecr/cp15_pmu_cecr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Count Enable Clear register (PMCNTENCLR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdcecr(void)
-{
-  return CP15_GET(PMCNTENCLR);
-}
-
-static inline void cp15_pmu_wrcecr(unsigned int cecr)
-{
-  CP15_SET(PMCNTENCLR, cecr);
-}
-
-static inline void cp15_pmu_cecr(unsigned int cecr)
-{
-  cp15_pmu_wrcecr(cecr | cp15_pmu_rdcecr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdcecr/cp15_pmu_wrcecr/cp15_pmu_cecr
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Overflow Flag Status Register (PMOVSR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdofsr(void)
-{
-  return CP15_GET(PMOVSR);
-}
-
-static inline void cp15_pmu_wrofsr(unsigned int ofsr)
-{
-  CP15_SET(PMOVSR, ofsr);
-}
-
-static inline void cp15_pmu_ofsr(unsigned int ofsr)
-{
-  cp15_pmu_wrofsr(ofsr | cp15_pmu_rdofsr());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdsir/cp15_pmu_wrsir/cp15_pmu_sir
- *
- * Description:
- *   Read/Write the Performance Monitors
- *   Software Increment register (PMSWINC)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdsir(void)
-{
-  return CP15_GET(PMSWINC);
-}
-
-static inline void cp15_pmu_wrsir(unsigned int sir)
-{
-  CP15_SET(PMSWINC, sir);
-}
-
-static inline void cp15_pmu_sir(unsigned int sir)
-{
-  cp15_pmu_wrsir(sir | cp15_pmu_rdsir());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wrecsr
- *
- * Description:
- *   Write the Performance Monitors Event Counter Selection Register (PMSELR)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wrecsr(unsigned int ecsr)
-{
-  CP15_SET(PMSELR, ecsr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wretsr
- *
- * Description:
- *   Write the Performance Monitors Event Type Select Register (PMXEVTYPER)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wretsr(unsigned int etsr)
-{
-  CP15_SET(PMXEVTYPER, etsr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wruer
- *
- * Description:
- *   Write the Performance Monitors User Enable Register (PMUSERENR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rduer(void)
-{
-  return CP15_GET(PMUSERENR);
-}
-
-static inline void cp15_pmu_wruer(unsigned int uer)
-{
-  CP15_SET(PMUSERENR, uer);
-}
-
-static inline void cp15_pmu_uer(unsigned int uer)
-{
-  cp15_pmu_wruer(uer | cp15_pmu_rduer());
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wriesr
- *
- * Description:
- *   Write the Performance Monitors
- *   Interrupt Enable Set register (PMINTENSET)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wriesr(unsigned int iesr)
-{
-  CP15_SET(PMINTENSET, iesr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_wriecr
- *
- * Description:
- *   Write the Performance Monitors
- *   Interrupt Enable Clear register (PMINTENCLR)
- *
- ****************************************************************************/
-
-static inline void cp15_pmu_wriecr(unsigned int iecr)
-{
-  CP15_SET(PMINTENCLR, iecr);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdccr
- *
- * Description:
- *   Read the Performance Monitors Cycle Count Register (PMCCNTR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdccr(void)
-{
-  return CP15_GET(PMCCNTR);
-}
-
-/****************************************************************************
- * Name: cp15_pmu_rdecr
- *
- * Description:
- *   Read the Performance Monitors Event Count Register (PMXEVCNTR)
- *
- ****************************************************************************/
-
-static inline unsigned int cp15_pmu_rdecr(void)
-{
-  return CP15_GET(PMXEVCNTR);
-}
-
-#endif /* __ASSEMBLY__ */
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ARCH_ARM_SRC_ARMV8_R_SCTLR_H */
diff --git a/arch/arm/src/common/Toolchain.defs 
b/arch/arm/src/common/Toolchain.defs
index 824c7b5f0d4..b4acab756e1 100644
--- a/arch/arm/src/common/Toolchain.defs
+++ b/arch/arm/src/common/Toolchain.defs
@@ -32,6 +32,10 @@
 #                   reliable code generation.
 #
 
+ifneq ($(filter y,$(CONFIG_ARCH_ARMV7A) $(CONFIG_ARCH_ARMV7R) 
$(CONFIG_ARCH_ARMV8R)),)
+  ARCHINCLUDES += 
${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)arm_a_r
+endif
+
 ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
   ARCHOPTIMIZATION += $(CONFIG_DEBUG_OPTLEVEL)
 else ifeq ($(CONFIG_DEBUG_FULLOPT),y)

Reply via email to