Merge branch 'master' of ssh://git.code.sf.net/p/nuttx/git

ChangeLog

@@ -8847,4 +8847,6 @@
 	* configs/Kconfig, README.txt, and nucleo-f401re:  Extend this board
 	  configuration to also support the Nucleo-F411RE.  From Serg Podtynnyi
 	  (2014-10-14).
+	* tools/Config.mk: "Add a PRELINK macro to Config.mk.  From Kriegleder
+	  (2014-10-17).
 

arch/arm/src/kl/kl_serial.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/mips/src/kl/kl_serial.c
+ * arch/arm/src/kl/kl_serial.c
  *
  *   Copyright (C) 2013-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -497,7 +497,7 @@ static void up_detach(struct uart_dev_s *dev)
  *   interrupt received on the 'irq'  It should call uart_transmitchars or
  *   uart_receivechar to perform the appropriate data transfers.  The
  *   interrupt handling logic must be able to map the 'irq' number into the
- *   approprite uart_dev_s structure in order to call these functions.
+ *   appropriate uart_dev_s structure in order to call these functions.
  *
  ****************************************************************************/
 
@@ -700,8 +700,8 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
   flags = irqsave();
   if (enable)
     {
-      /* Receive an interrupt when their is anything in the Rx data register (or an Rx
-       * timeout occurs).
+      /* Receive an interrupt when their is anything in the Rx data register
+       * (or an Rx timeout occurs).
        */
 
 #ifndef CONFIG_SUPPRESS_SERIAL_INTS
@@ -827,8 +827,8 @@ static bool up_txready(struct uart_dev_s *dev)
  *   Performs the low level UART initialization early in debug so that the
  *   serial console will be available during bootup.  This must be called
  *   before up_serialinit.  NOTE:  This function depends on GPIO pin
- *   configuration performed in up_consoleinit() and main clock iniialization
- *   performed in up_clkinitialize().
+ *   configuration performed in up_consoleinit() and main clock
+ *   initialization performed in up_clkinitialize().
  *
  ****************************************************************************/
 
@@ -867,8 +867,8 @@ void up_earlyserialinit(void)
  * Name: up_serialinit
  *
  * Description:
- *   Register serial console and serial ports.  This assumes
- *   that up_earlyserialinit was called previously.
+ *   Register serial console and serial ports.  This assumes that
+ *   up_earlyserialinit was called previously.
  *
  ****************************************************************************/
 
@@ -973,4 +973,3 @@ int up_getc(void)
   return kl_lowgetc();
 }
 #endif /* USE_SERIALDRIVER */
-

arch/arm/src/stm32/Kconfig

@@ -591,6 +591,7 @@ endchoice
 config STM32_STM32L15XX
 	bool
 	default n
+	select STM32_HAVE_SPI2
 	select STM32_HAVE_SPI3
 
 config STM32_ENERGYLITE

tools/Config.mk

@@ -191,6 +191,39 @@ define ARCHIVE
 endef
 endif
 
+# PRELINK - Prelink a list of files
+# This is useful when files were compiled with fvisibility=hidden.
+# Any symbol which was not explicitly made global is invisible outside the
+# prelinked file.
+#
+# Example: $(call PRELINK, prelink-file, "file1 file2 file3 ...")
+#
+# Note: The fileN strings may not contain spaces or  characters that may be
+# interpreted strangely by the shell
+#
+# Depends on these settings defined in board-specific Make.defs file
+# installed at $(TOPDIR)/Make.defs:
+#
+#   LD - The command to invoke the linker (includes any options)
+#    OBJCOPY - The command to invoke the object cop (includes any options)
+#
+# Depends on this settings defined in board-specific defconfig file installed
+# at $(TOPDIR)/.config:
+#
+#   CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+define PRELINK
+	@echo PRELINK: $1
+	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
+endef
+else
+define PRELINK
+	@echo "PRELINK: $1"
+	$(Q) $(LD) -Ur -o $1 $2 && $(OBJCOPY) --localize-hidden $1
+endef
+endif
+
 # DELFILE - Delete one file
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)