diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-02-19 18:30:34 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2009-02-19 18:30:34 +0000 |
| commit | 3674e55f833c382562116693389daa097a28a8fc (patch) | |
| tree | 9aa93cf41e1f19ef4ab52e08ef463e073dbad9e2 /ports | |
| parent | d1bc19825d65091c9dff82f4735fd947e9220502 (diff) | |
| download | ChibiOS-3674e55f833c382562116693389daa097a28a8fc.tar.gz ChibiOS-3674e55f833c382562116693389daa097a28a8fc.tar.bz2 ChibiOS-3674e55f833c382562116693389daa097a28a8fc.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@789 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ARM/rules.mk (renamed from ports/ARM7/rules.mk) | 26 | ||||
| -rw-r--r-- | ports/ARMCM3/rules.mk | 87 |
2 files changed, 8 insertions, 105 deletions
diff --git a/ports/ARM7/rules.mk b/ports/ARM/rules.mk index d34c557e4..5b7d5ae6f 100644 --- a/ports/ARM7/rules.mk +++ b/ports/ARM/rules.mk @@ -59,20 +59,23 @@ ifneq ($(TSRC),) CPPFLAGS += -DTHUMB_PRESENT
ASFLAGS += -DTHUMB_PRESENT
ifneq ($(ASRC),)
- # Mixed ARM and THUMB case.
+ # Mixed ARM and THUMB mode.
CFLAGS += -mthumb-interwork
CPPFLAGS += -mthumb-interwork
+ ASFLAGS += -mthumb-interwork
LDFLAGS += -mthumb-interwork
else
- # Pure THUMB case, THUMB C code cannot be called by ARM asm code directly.
+ # Pure THUMB mode, THUMB C code cannot be called by ARM asm code directly.
CFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
CPPFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING
+ ASFLAGS += -mno-thumb-interwork -DTHUMB_NO_INTERWORKING -mthumb
LDFLAGS += -mno-thumb-interwork -mthumb
- ASFLAGS += -DTHUMB_NO_INTERWORKING
endif
else
+ # Pure ARM mode
CPFLAGS += -mno-thumb-interwork
CPPFLAGS += -mno-thumb-interwork
+ ASFLAGS += -mno-thumb-interwork
LDFLAGS += -mno-thumb-interwork
endif
@@ -121,21 +124,8 @@ $(ASMOBJS) : %.o : %.s clean:
-rm -f $(OBJS)
- -rm -f $(PROJECT).elf
- -rm -f $(PROJECT).dmp
- -rm -f $(PROJECT).map
- -rm -f $(PROJECT).hex
- -rm -f $(PROJECT).bin
- -rm -f $(ACSRC:.c=.c.bak)
- -rm -f $(ACSRC:.c=.lst)
- -rm -f $(TCSRC:.c=.c.bak)
- -rm -f $(TCSRC:.c=.lst)
- -rm -f $(ACPPSRC:.cpp=.c.bak)
- -rm -f $(ACPPSRC:.cpp=.lst)
- -rm -f $(TCPPSRC:.cpp=.c.bak)
- -rm -f $(TCPPSRC:.cpp=.lst)
- -rm -f $(ASMSRC:.s=.s.bak)
- -rm -f $(ASMSRC:.s=.lst)
+ -rm -f $(ACSRC:.c=.lst) $(TCSRC:.c=.lst) $(ACPPSRC:.cpp=.lst) $(TCPPSRC:.cpp=.lst) $(ASMSRC:.s=.lst)
+ -rm -f $(PROJECT).elf $(PROJECT).dmp $(PROJECT).map $(PROJECT).hex $(PROJECT).bin
-rm -fR .dep
#
diff --git a/ports/ARMCM3/rules.mk b/ports/ARMCM3/rules.mk deleted file mode 100644 index 45f4d0129..000000000 --- a/ports/ARMCM3/rules.mk +++ /dev/null @@ -1,87 +0,0 @@ -# ARM7 common makefile rules.
-
-OPT = $(USE_OPT)
-
-ifeq ($(USE_CURRP_CACHING),yes)
-OPT += -ffixed-r7 -DCH_CURRP_REGISTER_CACHE='"r7"'
-endif
-
-ifeq ($(USE_LINK_GC),yes)
- OPT += -ffunction-sections -fdata-sections
-endif
-
-ifeq ($(USE_FWLIB),yes)
- include ./stm32lib/stm32lib.mk
- SRC += ${STM32SRC}
- # The thing generates a lot of aliasing warnings, this disables an
- # optimization and the warning disappears, the code is a bit larger however.
- OPT += -fno-strict-aliasing
-endif
-
-XINCDIR = $(patsubst %,-I%,$(INCDIR) $(DINCDIR) $(UINCDIR))
-XLIBDIR = $(patsubst %,-L%,$(LIBDIR) $(DLIBDIR) $(ULIBDIR))
-DEFS = $(DDEFS) $(UDEFS)
-ADEFS = $(DADEFS) $(UADEFS)
-COBJS = $(SRC:.c=.o)
-ASMOBJS = $(ASMSRC:.s=.o)
-OBJS = $(ASMOBJS) $(COBJS)
-LIBS = $(DLIBS) $(ULIBS)
-MCFLAGS = -mcpu=$(MCU) -mthumb
-
-ODFLAGS = -x --syms
-ASFLAGS = $(MCFLAGS) -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
-CPFLAGS = $(MCFLAGS) $(OPT) $(WARN) -Wa,-alms=$(<:.c=.lst) $(DEFS)
-ifeq ($(LINK_GC),yes)
- LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch,--gc-sections $(XLIBDIR)
-else
- LDFLAGS = $(MCFLAGS) -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(XLIBDIR)
-endif
-
-# Generate dependency information
-CPFLAGS += -MD -MP -MF .dep/$(@F).d
-
-#
-# Makefile rules
-#
-all: $(OBJS) $(PROJECT).elf $(PROJECT).hex $(PROJECT).bin $(PROJECT).dmp
-
-$(COBJS) : %.o : %.c
- @echo
- $(CC) -c $(CPFLAGS) -I . $(XINCDIR) $< -o $@
-
-$(ASMOBJS) : %.o : %.s
- @echo
- $(AS) -c $(ASFLAGS) -I . $(XINCDIR) $< -o $@
-
-%elf: $(OBJS)
- @echo
- $(CC) $(ASMOBJS) $(COBJS) $(LDFLAGS) $(LIBS) -o $@
-
-%hex: %elf
- $(HEX) $< $@
-
-%bin: %elf
- $(BIN) $< $@
-
-%dmp: %elf
- $(OD) $(ODFLAGS) $< > $@
-
-clean:
- -rm -f $(OBJS)
- -rm -f $(PROJECT).elf
- -rm -f $(PROJECT).dmp
- -rm -f $(PROJECT).map
- -rm -f $(PROJECT).hex
- -rm -f $(PROJECT).bin
- -rm -f $(SRC:.c=.c.bak)
- -rm -f $(SRC:.c=.lst)
- -rm -f $(ASMSRC:.s=.s.bak)
- -rm -f $(ASMSRC:.s=.lst)
- -rm -fR .dep
-
-#
-# Include the dependency files, should be the last of the makefile
-#
--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-
-# *** EOF ***
|