aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-04-01 02:33:53 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-04-05 13:59:33 -0400
commit6229da7a3ec40fb7d87c0c4edd38bc32da36ef13 (patch)
tree07db7db1761445bba73c58f98b79502708574874 /Makefile
parentcf4322804a94ab81b057ec1c0e2f397338b5ab69 (diff)
downloadlibrambutan-6229da7a3ec40fb7d87c0c4edd38bc32da36ef13.tar.gz
librambutan-6229da7a3ec40fb7d87c0c4edd38bc32da36ef13.zip
NVIC and SCB refactor
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile49
1 files changed, 21 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index d31c9ed..d0cead4 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,20 @@ ifeq ($(BOARD), maple_RET6)
DENSITY := STM32_HIGH_DENSITY
endif
+# Some target specific things
+ifeq ($(MEMORY_TARGET), ram)
+ LDSCRIPT := $(BOARD)/ram.ld
+ VECT_BASE_ADDR := VECT_TAB_RAM
+endif
+ifeq ($(MEMORY_TARGET), flash)
+ LDSCRIPT := $(BOARD)/flash.ld
+ VECT_BASE_ADDR := VECT_TAB_FLASH
+endif
+ifeq ($(MEMORY_TARGET), jtag)
+ LDSCRIPT := $(BOARD)/jtag.ld
+ VECT_BASE_ADDR := VECT_TAB_BASE
+endif
+
# Useful paths
ifeq ($(LIB_MAPLE_HOME),)
SRCROOT := .
@@ -51,24 +65,17 @@ SUPPORT_PATH := $(SRCROOT)/support
# Compilation flags.
# FIXME remove the ERROR_LED config
-GLOBAL_CFLAGS := -Os -g3 -gdwarf-2 -mcpu=cortex-m3 -mthumb -march=armv7-m \
- -nostdlib \
- -ffunction-sections -fdata-sections -Wl,--gc-sections \
- -DBOARD_$(BOARD) -DMCU_$(MCU) \
- -DERROR_LED_PORT=$(ERROR_LED_PORT) \
- -DERROR_LED_PIN=$(ERROR_LED_PIN) \
- -D$(DENSITY)
-GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall \
+GLOBAL_FLAGS := -D$(VECT_BASE_ADDR) \
-DBOARD_$(BOARD) -DMCU_$(MCU) \
-DERROR_LED_PORT=$(ERROR_LED_PORT) \
-DERROR_LED_PIN=$(ERROR_LED_PIN) \
- -D$(DENSITY)
+ -D$(DENSITY)
+GLOBAL_CFLAGS := -Os -g3 -gdwarf-2 -mcpu=cortex-m3 -mthumb -march=armv7-m \
+ -nostdlib -ffunction-sections -fdata-sections \
+ -Wl,--gc-sections $(GLOBAL_FLAGS)
+GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall $(GLOBAL_FLAGS)
GLOBAL_ASFLAGS := -mcpu=cortex-m3 -march=armv7-m -mthumb \
- -x assembler-with-cpp \
- -DBOARD_$(BOARD) -DMCU_$(MCU) \
- -DERROR_LED_PORT=$(ERROR_LED_PORT) \
- -DERROR_LED_PIN=$(ERROR_LED_PIN) \
- -D$(DENSITY)
+ -x assembler-with-cpp $(GLOBAL_FLAGS)
LDDIR := $(SUPPORT_PATH)/ld
LDFLAGS = -T$(LDDIR)/$(LDSCRIPT) -L$(LDDIR) \
@@ -79,20 +86,6 @@ LDFLAGS = -T$(LDDIR)/$(LDSCRIPT) -L$(LDDIR) \
include $(SUPPORT_PATH)/make/build-rules.mk
include $(SUPPORT_PATH)/make/build-templates.mk
-# Some target specific things
-ifeq ($(MEMORY_TARGET), ram)
- LDSCRIPT := $(BOARD)/ram.ld
- VECT_BASE_ADDR := VECT_TAB_RAM
-endif
-ifeq ($(MEMORY_TARGET), flash)
- LDSCRIPT := $(BOARD)/flash.ld
- VECT_BASE_ADDR := VECT_TAB_FLASH
-endif
-ifeq ($(MEMORY_TARGET), jtag)
- LDSCRIPT := $(BOARD)/jtag.ld
- VECT_BASE_ADDR := VECT_TAB_BASE
-endif
-
# Set all submodules here
LIBMAPLE_MODULES := $(SRCROOT)/libmaple
LIBMAPLE_MODULES += $(SRCROOT)/wirish