diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-21 17:44:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-21 17:44:11 -0600 |
| commit | 34a67da661d0767c3a2a6432d914c318dc93c986 (patch) | |
| tree | 4bb0fefb72bbdf838118a76035ac5c7b32a03232 | |
| parent | 1dfc0b66c355eaad6f1d860c6a526dac37749de0 (diff) | |
| download | nuttx-34a67da661d0767c3a2a6432d914c318dc93c986.tar.gz nuttx-34a67da661d0767c3a2a6432d914c318dc93c986.tar.bz2 nuttx-34a67da661d0767c3a2a6432d914c318dc93c986.zip | |
Tiva: Rename TIVA_CRC_BASE to TIVA_CCM_BASE
| -rw-r--r-- | nuttx/arch/arm/src/tiva/chip/cc3200_memorymap.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/chip/tm4c129_syscontrol.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/tiva/chip/cc3200_memorymap.h b/nuttx/arch/arm/src/tiva/chip/cc3200_memorymap.h index a48500f63..437dc6467 100644 --- a/nuttx/arch/arm/src/tiva/chip/cc3200_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/cc3200_memorymap.h @@ -121,7 +121,7 @@ /* Crypto Base Addresses */ # define TIVA_TCP_DTHE_BASE (TIVA_CRYPTO_BASE + 0x0000) /* -0x0fff: TCP Checksum & DTHE regs */ -# define TIVA_CRC_BASE TIVA_TCP_DTHE_BASE +# define TIVA_CCM_BASE TIVA_TCP_DTHE_BASE # define TIVA_SHA_BASE (TIVA_CRYPTO_BASE + 0x5000) /* -0x5fff: MD5/SHA */ # define TIVA_AES_BASE (TIVA_CRYPTO_BASE + 0x7000) /* -0x7fff: AES */ # define TIVA_DES_BASE (TIVA_CRYPTO_BASE + 0x9000) /* -0x9fff: DES */ diff --git a/nuttx/arch/arm/src/tiva/chip/tm4c129_syscontrol.h b/nuttx/arch/arm/src/tiva/chip/tm4c129_syscontrol.h index d33bc262d..5a4886ec6 100644 --- a/nuttx/arch/arm/src/tiva/chip/tm4c129_syscontrol.h +++ b/nuttx/arch/arm/src/tiva/chip/tm4c129_syscontrol.h @@ -469,7 +469,7 @@ /* CCM System Control Registers (CCM Control Offset) */ -#define TIVA_SYSCON_CCMCGREQ (TIVA_CRC_BASE+TIVA_SYSCON_CCMCGREQ_OFFSET) +#define TIVA_SYSCON_CCMCGREQ (TIVA_CCM_BASE+TIVA_SYSCON_CCMCGREQ_OFFSET) /* System Control Register Bit Definitions **************************************************/ /* System Control Registers (System Control Offset) */ diff --git a/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h b/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h index e1bb5a180..9d0945aaf 100644 --- a/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h @@ -450,7 +450,7 @@ /* Peripheral region 2 */ /* -0x2ffff: Reserved */ -# define TIVA_CRC_BASE (TIVA_PERIPH2_BASE + 0x30000) /* -0x30fff: CRC/Cryptographic Control */ +# define TIVA_CCM_BASE (TIVA_PERIPH2_BASE + 0x30000) /* -0x30fff: CRC/Cryptographic Control */ /* -0x33fff: Reserved */ # define TIVA_SHAMD5_BASE (TIVA_PERIPH2_BASE + 0x34000) /* -0x35fff: SHA/MD5 */ # define TIVA_AES_BASE (TIVA_PERIPH2_BASE + 0x36000) /* -0x37fff: AES */ |