summaryrefslogtreecommitdiffstats
path: root/nuttx/arch/arm/src/common
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-08-02 00:42:46 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-08-02 00:42:46 +0000
commitedeb4ed92a8e841ad62e8b5a06823a3037ce4301 (patch)
treef5f5fb874369d5379c1bdd728e0789c499e7ce81 /nuttx/arch/arm/src/common
parentf2f9740189ee65f3cda41cf20c618cc13626f681 (diff)
Move RAMLOG driver to drivers/syslog; Add ability to output debug information to any character device or file
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4996 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/arch/arm/src/common')
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c5
-rw-r--r--nuttx/arch/arm/src/common/up_internal.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index 20c23ef677..094835c293 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -173,11 +173,14 @@ void up_initialize(void)
/* Initialize the system logging device */
+#ifdef CONFIG_SYSLOG_CHAR
+ syslog_initialize();
+#endif
#ifdef CONFIG_RAMLOG_SYSLOG
ramlog_sysloginit();
#endif
- /* Initialize the netwok */
+ /* Initialize the network */
up_netinitialize();
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 67f11d619e..45cb1dcc09 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -84,6 +84,7 @@
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
+# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif