diff options
| author | Dave Hylands | 2014-01-24 01:05:30 -0800 |
|---|---|---|
| committer | Dave Hylands | 2014-01-24 08:46:48 -0800 |
| commit | c89c681a9f065e66ce817a024fda24abeed9519f (patch) | |
| tree | 5696bfbe38d0cb93e7ad0a9b0b14b353d99da740 /teensy | |
| parent | 2b2cb7b7f4f467b67082f79053118df78f48e66e (diff) | |
Rework makefiles. Add proper dependency checking.
Diffstat (limited to 'teensy')
| -rw-r--r-- | teensy/Makefile | 49 |
1 files changed, 10 insertions, 39 deletions
diff --git a/teensy/Makefile b/teensy/Makefile index e25f81481..0cd7272e7 100644 --- a/teensy/Makefile +++ b/teensy/Makefile @@ -1,30 +1,20 @@ -# define main target -all: all2 +include ../py/mkenv.mk # include py core make definitions include ../py/py.mk -# program for deletion -RM = /bin/rm -ECHO = @echo - ifeq ($(ARDUINO),) $(error Please define ARDUINO (where TeensyDuino is installed)) endif TOOLS_PATH = $(ARDUINO)/hardware/tools COMPILER_PATH = $(TOOLS_PATH)/arm-none-eabi/bin CORE_PATH = $(ARDUINO)/hardware/teensy/cores/teensy3 -TARGET=TEENSY -AS = $(COMPILER_PATH)/arm-none-eabi-as -CC = $(COMPILER_PATH)/arm-none-eabi-gcc -LD = $(COMPILER_PATH)/arm-none-eabi-ld -OBJCOPY = $(COMPILER_PATH)/arm-none-eabi-objcopy -SIZE = $(COMPILER_PATH)/arm-none-eabi-size +CROSS_COMPILE = $(COMPILER_PATH)/arm-none-eabi- CFLAGS_TEENSY = -DF_CPU=96000000 -DUSB_SERIAL -D__MK20DX256__ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -fsingle-precision-constant -Wdouble-promotion $(CFLAGS_TEENSY) -CFLAGS = -I. -I$(PY_SRC) -I$(CORE_PATH) -Wall -ansi -std=gnu99 +CFLAGS = -I. -I$(PY_SRC) -I$(CORE_PATH) -Wall -ansi -std=gnu99 $(CFLAGS_CORTEX_M4) LDFLAGS = -nostdlib -T mk20dx256.ld LIBS = -L $(COMPILER_PATH)/../lib/gcc/arm-none-eabi/4.7.2/thumb2 -lgcc @@ -35,9 +25,6 @@ else CFLAGS += -Os #-DNDEBUG endif -# if order is not important for these, move them up -CFLAGS += $(CFLAGS_CORTEX_M4) -D$(TARGET) - SRC_C = \ main.c \ lcd.c \ @@ -47,13 +34,15 @@ SRC_C = \ memzip.c \ usb.c \ -STM_SRC_C = \ +STM_SRC_C = $(addprefix stm/,\ malloc0.c \ printf.c \ string0.c \ + ) -STM_SRC_S = \ +STM_SRC_S = $(addprefix stm/,\ gchelper.s \ + ) SRC_TEENSY = \ mk20dx128.c \ @@ -70,7 +59,7 @@ OBJ = $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(STM_SRC_C:.c=.o) $(STM_SRC_S:.s=.o # the following is needed for BSD #LIB += -ltermcap -all2: $(BUILD) hex +all: hex hex: $(BUILD)/micropython-mz.hex post_compile: $(BUILD)/micropython-mz.hex @@ -100,25 +89,7 @@ $(BUILD)/%.hex: $(BUILD)/%.elf $(ECHO) "HEX $<" $(Q)$(OBJCOPY) -O ihex -R .eeprom "$<" "$@" -$(BUILD)/%.o: %.c - $(ECHO) "CC $<" - $(Q)$(CC) $(CFLAGS) -c -o $@ $< - -$(BUILD)/%.o: ../stm/%.s - $(ECHO) "AS $<" - $(Q)$(AS) -o $@ $< - -$(BUILD)/%.o: ../stm/%.c - $(ECHO) "CC $<" - $(Q)$(CC) $(CFLAGS) -c -o $@ $< - $(BUILD)/%.o: $(CORE_PATH)/%.c - $(ECHO) "CC $<" - $(Q)$(CC) $(CFLAGS) -c -o $@ $< - -$(BUILD)/main.o: mpconfigport.h - -clean: - $(RM) -rf $(BUILD) + $(call compile_c) -.PHONY: all all2 clean +include ../py/mkrules.mk |