Fixed lisa_l 1.1 makefile to use the correct linker script.

Added some more verbosity about linker script selection.
paparazzi · Aug 10, 2012 · 8e1bdd6 · 8e1bdd6
1 parent 62e2001
commit 8e1bdd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32
@@ -93,9 +93,11 @@ AOBJ    = $(ASRC:%.S=$(OBJDIR)/%.o)
 #   if not, use the default STM32f103re_flash.ld
 ifndef LDSCRIPT
 ifndef $(TARGET).LDSCRIPT
+$(warning Linker script for target "$(TARGET)" on board "$(BOARD)" not defined. Using stm32default.ld.)
 LDSCRIPT = $(SRC_ARCH)/stm32default.ld
 else
 LDSCRIPT = $($(TARGET).LDSCRIPT)
+$(info Using "$($(TARGET).LDSCRIPT)" as ldscript for target "$(TARGET)".)
 endif
 endif
 

diff --git a/conf/boards/lisa_l_1.1.makefile b/conf/boards/lisa_l_1.1.makefile
@@ -11,6 +11,7 @@
 BOARD=lisa_l
 BOARD_VERSION=1.0
 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+$(TARGET).LDSCRIPT=$(SRC_ARCH)/lisa-l.ld
 NO_LUFTBOOT=1
 
 # -----------------------------------------------------------------------