summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/kinetis
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-11 03:50:52 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-11 03:50:52 +0000
commit4a62de545bf87610c2415218e144ddef4dd0e75c (patch)
tree6c5b47ab79d40800d497f8a470aad5aa569ff9d6 /nuttx/arch/arm/src/kinetis
parent24af177eb1a3e7036f8a3ee5342970ddeb151124 (diff)
downloadpx4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.tar.gz
px4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.tar.bz2
px4-nuttx-4a62de545bf87610c2415218e144ddef4dd0e75c.zip
Add logic so that a RAM log can be used in place of a console device
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4380 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/kinetis')
-rw-r--r--nuttx/arch/arm/src/kinetis/kinetis_serial.c10
-rw-r--r--nuttx/arch/arm/src/kinetis/kinetis_start.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_serial.c b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
index 1e98b722f..dd1cd6873 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_serial.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_serial.c
@@ -1,8 +1,8 @@
/****************************************************************************
* arch/mips/src/kinetis/kinetis_serial.c
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -77,7 +77,7 @@
* provide some minimal implementation of up_putc.
*/
-#ifdef CONFIG_USE_SERIALDRIVER
+#ifdef USE_SERIALDRIVER
/* Which UART with be tty0/console and which tty1-4? The console will always
* be ttyS0. If there is no console then will use the lowest numbered UART.
@@ -1319,7 +1319,7 @@ int up_putc(int ch)
return ch;
}
-#else /* CONFIG_USE_SERIALDRIVER */
+#else /* USE_SERIALDRIVER */
/****************************************************************************
* Name: up_putc
@@ -1346,5 +1346,5 @@ int up_putc(int ch)
return ch;
}
-#endif /* CONFIG_USE_SERIALDRIVER */
+#endif /* USE_SERIALDRIVER */
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_start.c b/nuttx/arch/arm/src/kinetis/kinetis_start.c
index 1ebb894e1..c8f20fbdd 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_start.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_start.c
@@ -2,8 +2,8 @@
* arch/arm/src/kinetis/kinetis_start.c
* arch/arm/src/chip/kinetis_start.c
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -135,7 +135,7 @@ void __start(void)
*/
kinetis_lowsetup();
-#ifdef CONFIG_USE_EARLYSERIALINIT
+#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
#endif