From e530202ed1c43f468e236add225e51080120ea56 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 28 Jan 2013 15:03:17 +0000
Subject: Serial driver needed even when no console; Fix user LED settings in
 all STM32 configurations

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5575 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/arch/avr/src/common/up_initialize.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

(limited to 'nuttx/arch/avr/src/common/up_initialize.c')

diff --git a/nuttx/arch/avr/src/common/up_initialize.c b/nuttx/arch/avr/src/common/up_initialize.c
index 76de41c99..684dab09d 100644
--- a/nuttx/arch/avr/src/common/up_initialize.c
+++ b/nuttx/arch/avr/src/common/up_initialize.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/avr/src/common/up_initialize.c
  *
- *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,10 @@
  * up_serialinit to be incorrectly called if there is no USART configured to
  * be an RS-232 device (see as an example arch/avr/src/at32uc23/at32uc3_config.h)
  * This will probably have to be revisited someday.
+ *
+ * If a console is enabled and no other console device is specified, then a
+ * serial console is
+ * assumed.
  */
 
 #if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
@@ -78,6 +82,16 @@
 #  endif
 #endif
 
+/* If some other device is used as the console, then the serial driver may
+ * still be needed.  Let's assume that if the upper half serial driver is
+ * built, then the lower half will also be needed.  There is no need for
+ * the early serial initialization in this case.
+ */
+
+#if !defined(USE_SERIALDRIVER) && defined(CONFIG_STANDARD_SERIAL)
+#  define USE_SERIALDRIVER 1
+#endif
+
 /* Determine which device to use as the system logging device */
 
 #ifndef CONFIG_SYSLOG
@@ -182,11 +196,17 @@ void up_initialize(void)
   devnull_register();   /* Standard /dev/null */
 #endif
 
-  /* Initialize the console device driver */
+  /* Initialize the serial device driver */
 
-#if defined(USE_SERIALDRIVER)
+#ifdef USE_SERIALDRIVER
   up_serialinit();
-#elif defined(CONFIG_DEV_LOWCONSOLE)
+#endif
+
+  /* Initialize the console device driver (if it is other than the standard
+   * serial driver).
+   */
+
+#if defined(CONFIG_DEV_LOWCONSOLE)
   lowconsole_init();
 #elif defined(CONFIG_RAMLOG_CONSOLE)
   ramlog_consoleinit();
-- 
cgit v1.2.3