summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2003-08-14 17:39:49 +0100
committerRussell King <rmk@flint.arm.linux.org.uk>2003-08-14 17:39:49 +0100
commitaa5f1ea77b7d635db0345ee068b68f595c265193 (patch)
tree0e12127eec3080051a571efe25806af7631d6f1e /include
parent3b822c88f30d825810b4134bd6d5a156628c6c03 (diff)
[ARM] Add ARMv6 definitions.
- Add section descriptor bit definitions. - Add control register bit definitions. - Add architecture number.
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/proc-armv/pgtable.h3
-rw-r--r--include/asm-arm/proc-armv/system.h8
-rw-r--r--include/asm-arm/system.h1
3 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-arm/proc-armv/pgtable.h b/include/asm-arm/proc-armv/pgtable.h
index 616d80d69b1f..4b1cb65443ae 100644
--- a/include/asm-arm/proc-armv/pgtable.h
+++ b/include/asm-arm/proc-armv/pgtable.h
@@ -49,6 +49,9 @@
#define PMD_SECT_AP_WRITE (1 << 10)
#define PMD_SECT_AP_READ (1 << 11)
#define PMD_SECT_TEX(x) ((x) << 12) /* v5 */
+#define PMD_SECT_APX (1 << 15) /* v6 */
+#define PMD_SECT_S (1 << 16) /* v6 */
+#define PMD_SECT_nG (1 << 17) /* v6 */
#define PMD_SECT_UNCACHED (0)
#define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h
index 2983649418db..2179e2a175fe 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/include/asm-arm/proc-armv/system.h
@@ -41,6 +41,14 @@
#define CR_I (1 << 12) /* Icache enable */
#define CR_V (1 << 13) /* Vectors relocated to 0xffff0000 */
#define CR_RR (1 << 14) /* Round Robin cache replacement */
+#define CR_L4 (1 << 15) /* LDR pc can set T bit */
+#define CR_DT (1 << 16)
+#define CR_IT (1 << 18)
+#define CR_ST (1 << 19)
+#define CR_FI (1 << 21)
+#define CR_U (1 << 22) /* Unaligned access operation */
+#define CR_XP (1 << 23) /* Extended page tables */
+#define CR_VE (1 << 24) /* Vectored interrupts */
extern unsigned long cr_no_alignment; /* defined in entry-armv.S */
extern unsigned long cr_alignment; /* defined in entry-armv.S */
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 0acb296754d0..d000f45ed4e7 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -41,6 +41,7 @@ extern asmlinkage void __backtrace(void);
#define CPU_ARCH_ARMv5 4
#define CPU_ARCH_ARMv5T 5
#define CPU_ARCH_ARMv5TE 6
+#define CPU_ARCH_ARMv6 7
extern int cpu_architecture(void);