summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-08-07 22:56:23 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-08-07 22:56:23 +0000
commit27a3404136417d0331bb0a08a87cb1b574c588f3 (patch)
tree449d03533cfc7ebd9e85081c171ea77d5372f379 /nuttx/arch/arm/src/kinetis/kinetis_memorymap.h
parent0d33157ab2d7a4688cbf529bffda107b31b73735 (diff)
downloadpx4-nuttx-27a3404136417d0331bb0a08a87cb1b574c588f3.tar.gz
px4-nuttx-27a3404136417d0331bb0a08a87cb1b574c588f3.tar.bz2
px4-nuttx-27a3404136417d0331bb0a08a87cb1b574c588f3.zip
Add Kinetis UART header file
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3851 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/kinetis/kinetis_memorymap.h')
-rwxr-xr-xnuttx/arch/arm/src/kinetis/kinetis_memorymap.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h
index 9a495f442..2691b61ec 100755
--- a/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h
+++ b/nuttx/arch/arm/src/kinetis/kinetis_memorymap.h
@@ -155,7 +155,7 @@
# define KINETIS_SDHC_BASE 0x400b1000 /* SDHC */
# define KINETIS_FTM2_BASE 0x400b8000 /* FlexTimer 2 */
# define KINETIS_ADC1_BASE 0x400bb000 /* Analog-to-digital converter (ADC) 1 */
-# define KINETIS_SEGLCD_BASE 0x400be000 /* Segment LCD */
+# define KINETIS_SLCD_BASE 0x400be000 /* Segment LCD */
# define KINETIS_DAC0_BASE 0x400cc000 /* 12-bit digital-to-analog converter (DAC) 0 */
# define KINETIS_DAC1_BASE 0x400cd000 /* 12-bit digital-to-analog converter (DAC) 1 */
# define KINETIS_UART4_BASE 0x400ea000 /* UART4 */
@@ -185,8 +185,8 @@
*/
#elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) || defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) \
- defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) \
- defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100)
+ defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) \
+ defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100)
# define KINETIS_FLASH_BASE 0x00000000 /* –0x0fffffff Program flash and read-
* only data (Includes exception