summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-03-12 07:23:58 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-03-12 07:23:58 -0600
commit2e89159a7a892e6f028e5ecfdd4804526f2793f6 (patch)
treeb3e6faa257e8c89fa123bdc1c94209acd40d1943
parent76793de9023fa3481bf1a567652fc9167953416b (diff)
downloadnuttx-2e89159a7a892e6f028e5ecfdd4804526f2793f6.tar.gz
nuttx-2e89159a7a892e6f028e5ecfdd4804526f2793f6.tar.bz2
nuttx-2e89159a7a892e6f028e5ecfdd4804526f2793f6.zip
TM4C: Fix typos in memory map reported by Daniel Pereira de Carvalho
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2af1d3260..1f567ba9d 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6976,4 +6976,7 @@
More work is needed. The initial commit is little more thatn the
SAM3U-EK with name changes (2014-3-10).
* configs/spark: Refresh all spark configurations (2014-3-11).
+ * arch/arm/src/tiva/chip/tm4c_memorymap.h: Fix typos reported by
+ Daniel Pereira de Carvalho (2014-2-12).
+
diff --git a/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h b/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h
index bf137edb4..bbd528772 100644
--- a/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h
+++ b/nuttx/arch/arm/src/tiva/chip/tm4c_memorymap.h
@@ -116,7 +116,7 @@
# define TIVA_GPIOG_BASE (TIVA_PERIPH_BASE + 0x26000) /* -0x26fff: GPIO Port G */
# define TIVA_GPIOH_BASE (TIVA_PERIPH_BASE + 0x27000) /* -0x27fff: GPIO Port H */
# define TIVA_PWM0_BASE (TIVA_PERIPH_BASE + 0x28000) /* -0x28fff: PWM 0 */
-# define TIVA_PWM1_BASE (TIVA_PERIPH_BASE + 0x28000) /* -0x29fff: PWM 1 */
+# define TIVA_PWM1_BASE (TIVA_PERIPH_BASE + 0x29000) /* -0x29fff: PWM 1 */
/* -0x2ffff: Reserved */
# define TIVA_TIMER0_BASE (TIVA_PERIPH_BASE + 0x30000) /* -0x30fff: 16/32 Timer 0 */
# define TIVA_TIMER1_BASE (TIVA_PERIPH_BASE + 0x31000) /* -0x31fff: 16/32 Timer 1 */