From 8e1bdd6fca82126d7d3f15e967a5dbad359768bb Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Fri, 10 Aug 2012 15:53:49 -0700 Subject: [PATCH] Fixed lisa_l 1.1 makefile to use the correct linker script. Added some more verbosity about linker script selection. --- conf/Makefile.stm32 | 2 ++ conf/boards/lisa_l_1.1.makefile | 1 + 2 files changed, 3 insertions(+) diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32 index 8349cdc26c9..485766ca4e8 100644 --- 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 index 0a5b55373b8..9a6521e594d 100644 --- 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 # -----------------------------------------------------------------------