Merge remote-tracking branch 'origin/master' into efm32

This commit is contained in:
Gregory Nutt 2014-10-17 08:46:10 -06:00
commit 1dae54f9ad
3 changed files with 36 additions and 0 deletions

View File

@ -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).

View File

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

View File

@ -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)