From 8e178ec5fa116e0a1408759b0a3504899ecd60bb Mon Sep 17 00:00:00 2001
From: Alain Carlucci <alain.carlucci@skywarder.eu>
Date: Wed, 11 Oct 2017 23:03:57 +0200
Subject: [PATCH] [Makefile] moved main.map in bin/board_name
---
Makefile.template | 2 +-
config/Makefile.inc | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile.template b/Makefile.template
index 661325124..b41036700 100644
--- a/Makefile.template
+++ b/Makefile.template
@@ -56,7 +56,7 @@ CFLAGS := $(CFLAGS_BASE) -I$(CONFPATH) -I$(CONFPATH)/config/$(BOARD_INC) \
-I. -I$(KPATH) -I$(KPATH)/arch/common -I$(KPATH)/$(ARCH_INC) \
-I$(KPATH)/$(BOARD_INC) $(INCLUDE_DIRS)
AFLAGS := $(AFLAGS_BASE)
-LFLAGS := $(LFLAGS_BASE)
+LFLAGS := $(LFLAGS_BASE) -Wl,--gc-sections,-Map,$(BINDIR)/${SBS_BIN_NAME}.map
DFLAGS := -MMD -MP
LINK_LIBS := $(LIBS) -L$(KPATH)/bin/$(OPT_BOARD) -Wl,--start-group \
diff --git a/config/Makefile.inc b/config/Makefile.inc
index 6e1614b81..cbeb823fd 100644
--- a/config/Makefile.inc
+++ b/config/Makefile.inc
@@ -572,7 +572,7 @@ ifeq ($(ARCH),arm7_lpc2000)
-ffunction-sections -Wall -g -c
CXXFLAGS_BASE += -D_ARCH_ARM7_LPC2000 -mcpu=arm7tdmi $(OPT_OPTIMIZATION) \
-ffunction-sections $(OPT_EXCEPT) -Wall -g -c
- LFLAGS_BASE := -mcpu=arm7tdmi -Wl,--gc-sections,-Map,main.map \
+ LFLAGS_BASE := -mcpu=arm7tdmi \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
@@ -971,7 +971,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
CXXFLAGS_BASE += -D_ARCH_CORTEXM3_STM32 $(CLOCK_FREQ) $(XRAM) \
$(OPT_EXCEPT) -mcpu=cortex-m3 -mthumb \
$(OPT_OPTIMIZATION) -ffunction-sections -Wall -g -c
- LFLAGS_BASE := -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map,main.map \
+ LFLAGS_BASE := -mcpu=cortex-m3 -mthumb \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
@@ -1280,7 +1280,7 @@ else ifeq ($(ARCH),cortexM4_stm32f4)
$(OPT_EXCEPT) $(OPT_OPTIMIZATION) -ffunction-sections \
-Wall -g -c
LFLAGS_BASE := -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 \
- -Wl,--gc-sections,-Map,main.map \
+ \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
@@ -1510,7 +1510,7 @@ else ifeq ($(ARCH),cortexM3_stm32f2)
CXXFLAGS_BASE += -D_ARCH_CORTEXM3_STM32F2 $(CLOCK_FREQ) $(XRAM) \
$(OPT_EXCEPT) -mcpu=cortex-m3 -mthumb \
$(OPT_OPTIMIZATION) -ffunction-sections -Wall -g -c
- LFLAGS_BASE := -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map,main.map \
+ LFLAGS_BASE := -mcpu=cortex-m3 -mthumb \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
@@ -1590,7 +1590,7 @@ else ifeq ($(ARCH),cortexM3_stm32l1)
CXXFLAGS_BASE += -D_ARCH_CORTEXM3_STM32L1 $(CLOCK_FREQ) $(XRAM) \
$(OPT_EXCEPT) -mcpu=cortex-m3 -mthumb \
$(OPT_OPTIMIZATION) -ffunction-sections -Wall -g -c
- LFLAGS_BASE := -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map,main.map \
+ LFLAGS_BASE := -mcpu=cortex-m3 -mthumb \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
@@ -1674,7 +1674,7 @@ else ifeq ($(ARCH),cortexM3_efm32gg)
CXXFLAGS_BASE += -D_ARCH_CORTEXM3_EFM32GG $(CLOCK_FREQ) \
$(OPT_EXCEPT) -mcpu=cortex-m3 -mthumb \
$(OPT_OPTIMIZATION) -ffunction-sections -Wall -g -c
- LFLAGS_BASE := -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,-Map,main.map \
+ LFLAGS_BASE := -mcpu=cortex-m3 -mthumb \
-Wl,-T$(KPATH)/$(LINKER_SCRIPT) $(OPT_EXCEPT) \
$(OPT_OPTIMIZATION) -nostdlib
--
GitLab