diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-17 08:46:10 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-17 08:46:10 -0600 |
| commit | ae272da231b626c48d06d712202ac7e416620c32 (patch) | |
| tree | afaafca85e3c498ad5f53dd68c14e952fb4c0cfb | |
| parent | 9774f6ebbd58c2a8ced6dfbe7611346ee1df72ce (diff) | |
| parent | 51640da0fe8554bec2624f6b4d10bcfb56683724 (diff) | |
| download | px4-nuttx-ae272da231b626c48d06d712202ac7e416620c32.tar.gz px4-nuttx-ae272da231b626c48d06d712202ac7e416620c32.tar.bz2 px4-nuttx-ae272da231b626c48d06d712202ac7e416620c32.zip | |
Merge remote-tracking branch 'origin/master' into efm32
| -rwxr-xr-x | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 1 | ||||
| -rw-r--r-- | nuttx/tools/Config.mk | 33 |
3 files changed, 36 insertions, 0 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index fda8dead6..ee079e7fd 100755 --- a/nuttx/ChangeLog +++ b/nuttx/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). diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index 2c0a6e583..60f8d20da 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/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 diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index 6ee7d716e..f222cc0e0 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/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) |