2 files changed, 28 insertions, 8 deletions
diff --git a/nuttx/arch/sim/src/up_initialize.c b/nuttx/arch/sim/src/up_initialize.c
index 488f2431e..66fb11b9a 100644
--- a/nuttx/arch/sim/src/up_initialize.c
+++ b/nuttx/arch/sim/src/up_initialize.c
@@ -51,12 +51,6 @@
  * Private Definitions
  ****************************************************************************/
 
-/* Determine which device to use as the system logging device */
-
-#ifndef CONFIG_SYSLOG
-#  undef CONFIG_RAMLOG_SYSLOG
-#endif
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -104,7 +98,14 @@ void up_initialize(void)
 
   devnull_register();       /* Standard /dev/null */
   devzero_register();       /* Standard /dev/zero */
+
+  /* Register a console (or not) */
+
+#if defined(USE_DEVCONSOLE)
   up_devconsole();          /* Our private /dev/console */
+#elif defined(CONFIG_RAMLOG_CONSOLE)
+  ramlog_consoleinit();
+#endif
 
 #ifdef CONFIG_RAMLOG_SYSLOG
   ramlog_sysloginit();      /* System logging device */
diff --git a/nuttx/arch/sim/src/up_internal.h b/nuttx/arch/sim/src/up_internal.h
index 194191de0..343a4b39b 100644
--- a/nuttx/arch/sim/src/up_internal.h
+++ b/nuttx/arch/sim/src/up_internal.h
@@ -1,8 +1,8 @@
 /**************************************************************************
  * up_internal.h
  *
- *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *   Copyright (C) 2007, 2009, 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
@@ -63,6 +63,25 @@
 #  endif
 #endif
 
+/* Determine which (if any) console driver to use */
+
+#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS == 0
+#  undef USE_DEVCONSOLE
+#  undef CONFIG_RAMLOG_CONSOLE
+#else
+#  if defined(CONFIG_RAMLOG_CONSOLE)
+#    undef USE_DEVCONSOLE
+#  else
+#    define USE_DEVCONSOLE 1
+#  endif
+#endif
+
+/* Determine which device to use as the system logging device */
+
+#ifndef CONFIG_SYSLOG
+#  undef CONFIG_RAMLOG_SYSLOG
+#endif
+
 /* Context Switching Definitions ******************************************/
 /* Storage order: %ebx, $esi, %edi, %ebp, sp, and return PC */