ARMv7-A: Cosmetic changes

This commit is contained in:
Gregory Nutt 2015-12-14 08:42:39 -06:00
parent cd8d37f46b
commit edecfc2dac
6 changed files with 10 additions and 8 deletions

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/armv7/up_coherent_dcache.c
* arch/arm/src/armv7-a/up_coherent_dcache.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -54,10 +54,13 @@
* Configuration
**********************************************************************************/
#undef ALIGNMENT_TRAP
/* Hard-coded options */
#undef CPU_ALIGNMENT_TRAP
#undef CPU_CACHE_ROUND_ROBIN
#undef CPU_DCACHE_DISABLE
#undef CPU_ICACHE_DISABLE
#undef CPU_AFE_ENABLE
/* There are three operational memory configurations:
*
@ -465,7 +468,7 @@ __start:
orr r0, r0, #(SCTLR_I)
#endif
#ifdef ALIGNMENT_TRAP
#ifdef CPU_ALIGNMENT_TRAP
/* Alignment abort enable
*
* SCTLR_A Bit 1: Strict alignment enabled
@ -474,7 +477,7 @@ __start:
orr r0, r0, #(SCTLR_A)
#endif
#ifdef CONFIG_AFE_ENABLE
#ifdef CPU_AFE_ENABLE
/* AP[0:2] Permissions model
*
* SCTLR_AFE Bit 29: Full, legacy access permissions behavior (reset value).

View File

@ -461,7 +461,7 @@ __start:
orr r0, r0, #(SCTLR_A)
#endif
#ifdef CONFIG_AFE_ENABLE
#ifdef CPU_AFE_ENABLE
/* AP[0:2] Permissions model
*
* SCTLR_AFE Bit 29: Full, legacy access permissions behavior (reset value).

View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/armv7/arm_undefinedinsn.c
* arch/arm/src/armv7-a/arm_undefinedinsn.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,6 +1,5 @@
/****************************************************************************
* arch/arm/src/armv7-a/l2cc.h
* Non-CP15 Registers
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -342,7 +342,7 @@
* PL2 - Software executing in Hyp mode
*/
#ifdef CONFIG_AFE_ENABLE
#ifdef CPU_AFE_ENABLE
/* AP[2:1] access permissions model. AP[0] is used as an access flag:
*
* AP[2] AP[1] PL1 PL0 Description