From 7a89aa1ea7e1b02b5cd310986adf4239ec0ce91d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 18 Feb 2019 12:59:05 -0800 Subject: [PATCH] altos: Move common build definitions to src/Makefile.defs This cleans up the build process for all architectures, providing a common place to specify vpath, cflags and build rules for various common files. Signed-off-by: Keith Packard --- configure.ac | 1 - src/Makedefs.in | 2 + src/Makefile | 4 +- src/Makefile.defs | 56 +++++++++++++++ src/Version.in | 1 - src/avr-demo/Makefile | 2 +- src/avr/Makefile.defs | 6 +- src/chaoskey-v0.1/Makefile | 2 +- src/chaoskey-v1.0/Makefile | 7 +- src/cortexelf-v1/Makefile | 2 +- src/detherm/Makefile | 2 +- src/easymega-v1.0/Makefile | 10 +-- src/easymega-v2.0/Makefile | 10 +-- src/easymini-v1.0/Makefile | 7 +- src/easymini-v2.0/Makefile | 7 +- src/fox1ihu/Makefile | 2 +- src/lambdakey-v1.0/Makefile | 2 +- src/lpc/Makefile-flash.defs | 7 +- src/lpc/Makefile-lpc.defs | 52 ++------------ src/lpc/Makefile.defs | 3 - src/lpc/clock_figure.5c | 113 ++++++++++++++++++++++++++++++ src/lpcxpresso/Makefile | 2 +- src/microkite/Makefile | 49 +++---------- src/micropeak-v2.0/Makefile | 15 ++-- src/micropeak/Makefile | 47 ++----------- src/microsplash/Makefile | 47 ++----------- src/mpusb-v3.0/Makefile | 2 +- src/nucleao-32/Makefile | 2 +- src/pnpservo-v1/Makefile | 2 +- src/stm-bringup/Makefile | 4 +- src/stm-demo/Makefile | 2 +- src/stm-flash/Makefile | 2 +- src/stm-scheme-newlib/Makefile | 2 +- src/stm-vga/Makefile | 2 +- src/stm/Makefile-flash.defs | 45 ++---------- src/stm/Makefile-stm.defs | 13 ++++ src/stm/Makefile.defs | 53 +------------- src/stm32f4/Makefile-flash.defs | 5 +- src/stm32f4/Makefile-stm32f4.defs | 47 ++----------- src/stm32f4/Makefile.defs | 6 -- src/stmf0/Makefile-flash.defs | 5 +- src/stmf0/Makefile-stmf0.defs | 51 ++------------ src/stmf0/Makefile.defs | 4 +- src/teleballoon-v2.0/Makefile | 10 +-- src/telebt-v3.0/Makefile | 7 +- src/telebt-v4.0/Makefile | 7 +- src/teledongle-v3.0/Makefile | 7 +- src/telefireeight-v1.0/Makefile | 7 +- src/telefireeight-v2.0/Makefile | 7 +- src/telefireone-v1.0/Makefile | 2 +- src/telefiretwo-v0.1/Makefile | 7 +- src/telefiretwo-v0.2/Makefile | 2 +- src/telegps-v0.1/Makefile | 2 +- src/telegps-v0.3/Makefile | 7 +- src/telegps-v1.0/Makefile | 7 +- src/telegps-v2.0/Makefile | 9 ++- src/telelco-v0.2-cc1200/Makefile | 10 +-- src/telelco-v0.2/Makefile | 12 +--- src/telelco-v0.3/Makefile | 10 +-- src/telelco-v2.0/Makefile | 7 +- src/telelcotwo-v0.1/Makefile | 7 +- src/telemega-v0.1/Makefile | 10 +-- src/telemega-v1.0/Makefile | 10 +-- src/telemega-v2.0/Makefile | 10 +-- src/telemega-v3.0/Makefile | 10 +-- src/telemetrum-v2.0/Makefile | 10 +-- src/telemetrum-v3.0/Makefile | 10 +-- src/telemini-v3.0/Makefile | 7 +- src/tmgps-v2.0/Makefile | 2 +- src/vidtime/Makefile | 2 +- 70 files changed, 315 insertions(+), 588 deletions(-) create mode 100644 src/Makefile.defs delete mode 100644 src/Version.in create mode 100644 src/lpc/clock_figure.5c create mode 100644 src/stm/Makefile-stm.defs diff --git a/configure.ac b/configure.ac index a2d84ce6..0e4b204c 100644 --- a/configure.ac +++ b/configure.ac @@ -573,7 +573,6 @@ map-server/Makefile map-server/altos-mapd/Makefile map-server/altos-map/Makefile map-server/altos-mapj/Makefile -src/Version ]) echo "" diff --git a/src/Makedefs.in b/src/Makedefs.in index b87e8846..b5639f73 100644 --- a/src/Makedefs.in +++ b/src/Makedefs.in @@ -7,3 +7,5 @@ HAVE_NEWLIB_NANO=@HAVE_NEWLIB_NANO@ AVR_CC=@AVR_CC@ AVR_OBJCOPY=@AVR_OBJCOPY@ HAVE_AVR_CC=@HAVE_AVR_CC@ + +VERSION=@VERSION@ diff --git a/src/Makefile b/src/Makefile index 1efa1b33..b887da39 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,8 +12,8 @@ vpath kalman_micro.5c kalman vpath load_csv.5c kalman vpath matrix.5c kalman -include Version TOPDIR=. + include Makedefs ARMM3DIRS=\ @@ -49,7 +49,7 @@ ARMM0DIRS=\ micropeak-v2.0 micropeak-v2.0/flash-loader AVRDIRS=\ - micropeak microkite + micropeak microkite microsplash SUBDIRS= diff --git a/src/Makefile.defs b/src/Makefile.defs new file mode 100644 index 00000000..6df0c3fe --- /dev/null +++ b/src/Makefile.defs @@ -0,0 +1,56 @@ +include $(TOPDIR)/Makedefs + +AO_VPATH=$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR)/aes:$(TOPDIR)/math:$(TOPDIR)/draw:$(TOPDIR) +vpath make-altitude $(TOPDIR)/util +vpath make-kalman $(TOPDIR)/util +vpath kalman.5c $(TOPDIR)/kalman +vpath kalman_filter.5c $(TOPDIR)/kalman +vpath load_csv.5c $(TOPDIR)/kalman +vpath matrix.5c $(TOPDIR)/kalman +vpath ao-make-product.5c $(TOPDIR)/util + +WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ + -Wpointer-arith \ + -Wstrict-prototypes \ + -Wmissing-prototypes \ + -Wmissing-declarations \ + -Wnested-externs \ + -Wshadow \ + -Warray-bounds=2 + +OPT=-Os + +NEWLIB_CFLAGS= \ + -ffreestanding -nostdlib \ + -DNEWLIB_INTEGER_PRINTF_SCANF \ + -isystem $(NEWLIB_NANO)/arm-none-eabi/include + +AO_CFLAGS=\ + -std=gnu99 \ + -I. -I$(TOPDIR) -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ + -I$(TOPDIR)/math -I$(TOPDIR)/draw -I$(TOPDIR)/product $(WARN_FLAGS) $(OPT) -g + +NICKLE=nickle +ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex + +.SUFFIXES: .elf .ihx + +.elf.ihx: + $(ELFTOHEX) --output=$@ $*.elf + +V=0 +# The user has explicitly enabled quiet compilation. +ifeq ($(V),0) +quiet = @printf " $1 $2 $@\n"; $($1) +endif +# Otherwise, print the full command line. +quiet ?= $($1) + +.c.o: + $(call quiet,CC) -c $(CFLAGS) -o $@ $< + +.DEFAULT_GOAL=all + +ao_product.h: ao-make-product.5c $(TOPDIR)/Makedefs + $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + diff --git a/src/Version.in b/src/Version.in deleted file mode 100644 index aff9490b..00000000 --- a/src/Version.in +++ /dev/null @@ -1 +0,0 @@ -VERSION=@VERSION@ diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile index 0aca6f8a..2f3a0750 100644 --- a/src/avr-demo/Makefile +++ b/src/avr-demo/Makefile @@ -47,7 +47,7 @@ MCU=atmega32u4 PRODUCT_DEF=-DAVR_DEMO IDPRODUCT=0x000a CFLAGS = $(PRODUCT_DEF) -I. -I../avr -I../kernel -I.. -CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -Os -mcall-prologues +CFLAGS += -mmcu=$(MCU) -Wall -Wstrict-prototypes -mcall-prologues NICKLE=nickle diff --git a/src/avr/Makefile.defs b/src/avr/Makefile.defs index eeb9a881..48aff48e 100644 --- a/src/avr/Makefile.defs +++ b/src/avr/Makefile.defs @@ -2,11 +2,7 @@ ifndef TOPDIR TOPDIR=.. endif -ifndef VERSION -include $(TOPDIR)/Version -endif - -include $(TOPDIR)/Makedefs +include $(TOPDIR)/Makefile.defs CC=$(AVR_CC) OBJCOPY=$(AVR_OBJCOPY) diff --git a/src/chaoskey-v0.1/Makefile b/src/chaoskey-v0.1/Makefile index faa4a291..43f8bf9a 100644 --- a/src/chaoskey-v0.1/Makefile +++ b/src/chaoskey-v0.1/Makefile @@ -43,7 +43,7 @@ PRODUCT_DEF=-DCHAOSKEY_V_0_1 IDVENDOR=0x1d50 IDPRODUCT=0x60c6 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=chaoskey-v0.1 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile index 329f603d..2d92d4f0 100644 --- a/src/chaoskey-v1.0/Makefile +++ b/src/chaoskey-v1.0/Makefile @@ -48,7 +48,7 @@ PRODUCT_DEF=-DCHAOSKEY_V_1_0 IDVENDOR=0x1d50 IDPRODUCT=0x60c6 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=chaoskey-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -62,10 +62,7 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(BIN) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -V $(IDVENDOR) -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) -o $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) diff --git a/src/cortexelf-v1/Makefile b/src/cortexelf-v1/Makefile index 12c658dc..63619b7a 100644 --- a/src/cortexelf-v1/Makefile +++ b/src/cortexelf-v1/Makefile @@ -95,7 +95,7 @@ LDFLAGS=-L../stm -L/local/newlib-mini/arm-none-eabi/lib/thumb/v7-m/ -Wl,-Tcortex AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../draw -I../scheme -I.. -I/local/newlib-mini/arm-none-eabi/include LIBS=-lc -lm -lgcc -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) SRC=$(ALTOS_SRC) ao_cortexelf.c diff --git a/src/detherm/Makefile b/src/detherm/Makefile index 7681a049..e527fa09 100644 --- a/src/detherm/Makefile +++ b/src/detherm/Makefile @@ -52,7 +52,7 @@ PRODUCT=Detherm-v1.0 PRODUCT_DEF=-DDETHERM_V_1_0 IDPRODUCT=0x0013 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=detherm-v1.0 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/easymega-v1.0/Makefile b/src/easymega-v1.0/Makefile index 76e7319e..b8f6df4a 100644 --- a/src/easymega-v1.0/Makefile +++ b/src/easymega-v1.0/Makefile @@ -93,7 +93,7 @@ PRODUCT=EasyMega-v1.0 PRODUCT_DEF=-DEASYMEGA IDPRODUCT=0x0028 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=easymega-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -105,16 +105,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/easymega-v2.0/Makefile b/src/easymega-v2.0/Makefile index bfe8a849..ab478a42 100644 --- a/src/easymega-v2.0/Makefile +++ b/src/easymega-v2.0/Makefile @@ -90,7 +90,7 @@ PRODUCT=EasyMega-v2.0 PRODUCT_DEF=-DEASYMEGA IDPRODUCT=0x0028 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=easymega-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -102,16 +102,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/easymini-v1.0/Makefile b/src/easymini-v1.0/Makefile index 654be22b..301a0c1d 100644 --- a/src/easymini-v1.0/Makefile +++ b/src/easymini-v1.0/Makefile @@ -51,7 +51,7 @@ PRODUCT=EasyMini-v1.0 PRODUCT_DEF=-DEASYMINI_V_1_0 IDPRODUCT=0x0026 -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) PROGNAME=easymini-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -63,10 +63,7 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) diff --git a/src/easymini-v2.0/Makefile b/src/easymini-v2.0/Makefile index 9b4cc6d7..2f790244 100644 --- a/src/easymini-v2.0/Makefile +++ b/src/easymini-v2.0/Makefile @@ -53,7 +53,7 @@ PRODUCT=EasyMini-v2.0 PRODUCT_DEF=-DEASYMINI_V_2_0 IDPRODUCT=0x0026 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=easymini-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -65,10 +65,7 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) diff --git a/src/fox1ihu/Makefile b/src/fox1ihu/Makefile index 61314db9..0277dd7e 100644 --- a/src/fox1ihu/Makefile +++ b/src/fox1ihu/Makefile @@ -59,7 +59,7 @@ PRODUCT=Fox1IHU-v2 PRODUCT_DEF=-DFOX IDPRODUCT=0x0024 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=fox1ihu-v0.1 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile index f8b5c7f5..53ecda90 100644 --- a/src/lambdakey-v1.0/Makefile +++ b/src/lambdakey-v1.0/Makefile @@ -40,7 +40,7 @@ PRODUCT=LambdaKey-v1.0 PRODUCT_DEF=-DLAMBDAKEY IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) -I. -I$(aoschemelib) $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) -I. -I$(aoschemelib) $(STMF0_CFLAGS) PROGNAME=lambdakey-v1.0 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/lpc/Makefile-flash.defs b/src/lpc/Makefile-flash.defs index 4a245d10..44b43bfe 100644 --- a/src/lpc/Makefile-flash.defs +++ b/src/lpc/Makefile-flash.defs @@ -33,7 +33,7 @@ PRODUCT=AltosFlash PRODUCT_DEF=-DALTOS_FLASH IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/lpc -Wl,-Taltos-loader.ld @@ -41,10 +41,7 @@ PROGNAME=altos-flash PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf $(PROG): Makefile $(OBJ) altos-loader.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c $(TOPDIR)/Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs index 16da583f..8b297351 100644 --- a/src/lpc/Makefile-lpc.defs +++ b/src/lpc/Makefile-lpc.defs @@ -2,57 +2,13 @@ ifndef TOPDIR TOPDIR=.. endif -include $(TOPDIR)/Makedefs +include $(TOPDIR)/Makefile.defs -vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR)/aes:$(TOPDIR):$(TOPDIR)/math -vpath make-altitude $(TOPDIR)/util -vpath make-kalman $(TOPDIR)/util -vpath kalman.5c $(TOPDIR)/kalman -vpath kalman_filter.5c $(TOPDIR)/kalman -vpath load_csv.5c $(TOPDIR)/kalman -vpath matrix.5c $(TOPDIR)/kalman -vpath ao-make-product.5c $(TOPDIR)/util +vpath % $(TOPDIR)/lpc:$(AO_VPATH) -.SUFFIXES: .elf .ihx - -.elf.ihx: - $(ELFTOHEX) --output=$@ $*.elf - - -ifndef VERSION -include $(TOPDIR)/Version -endif - -ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex CC=$(ARM_CC) -WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ - -Wpointer-arith \ - -Wstrict-prototypes \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wnested-externs \ - -Wshadow - -AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ - -DNEWLIB_INTEGER_PRINTF_SCANF \ - -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math -I$(TOPDIR) \ - -isystem $(NEWLIB_NANO)/arm-none-eabi/include - -LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb\ - -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) - -NICKLE=nickle - LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v6-m -lc -lm -lgcc -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -.c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< +LPC_CFLAGS=-mlittle-endian -mcpu=cortex-m0 -mthumb\ + -I$(TOPDIR)/lpc $(AO_CFLAGS) $(NEWLIB_CFLAGS) diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs index 5bb8133d..7fdcf0dc 100644 --- a/src/lpc/Makefile.defs +++ b/src/lpc/Makefile.defs @@ -3,7 +3,6 @@ TOPDIR=.. endif include $(TOPDIR)/lpc/Makefile-lpc.defs -include $(TOPDIR)/Makedefs LDFLAGS=$(CFLAGS) -L$(TOPDIR)/lpc -Wl,-Taltos.ld -n @@ -11,5 +10,3 @@ ao_serial_lpc.h: $(TOPDIR)/lpc/baud_rate ao_pins.h nickle $(TOPDIR)/lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@ ao_serial_lpc.o: ao_serial_lpc.h - -.DEFAULT_GOAL=all diff --git a/src/lpc/clock_figure.5c b/src/lpc/clock_figure.5c new file mode 100644 index 00000000..d2f632a0 --- /dev/null +++ b/src/lpc/clock_figure.5c @@ -0,0 +1,113 @@ +#!/usr/bin/nickle + +real +pll_out(real clock_in, int mul, int div) +{ + return clock_in * mul / div; +} + +real +pll_in(real pll_out, int mul, int div) +{ + return pll_out * div / mul; +} + +real +fcco_out(real clock_in, int mul, int div) +{ + real out = pll_out(clock_in, mul, div); + return out * div; +} + +bool +valid_clock_in(real clock_in) +{ + return 10 <= clock_in && clock_in < 25; +} + +bool +valid_fcco(real clock_in, int mul, int div) +{ + real fcco = fcco_out (clock_in, mul, div); + return 156 <= fcco && fcco <= 320; +} + +void +all_clocks(real clock_in) { + for (int mul = 1; mul <= 32; mul++) { + for (int div = 2; div <= 16; div *= 2) { + if (!valid_fcco(clock_in, mul, div)) + printf ("clock_in %f mul %d div %d invalid fcco %f\n", + clock_in, mul, div, fcco_out(clock_in, mul, div)); + else + printf ("clock_in %f mul %d div %d pll_out %f\n", + clock_in, mul, div, pll_out(clock_in, mul, div)); + } + } +} + +typedef struct { + real clock_in; + int mul; + int div; + real pll_out; +} clock; + +clock[] +all_ins(real pll_out) +{ + clock[...] clocks = {}; + for (int mul = 1; mul <= 32; mul++) { + for (int div = 2; div <= 16; div *= 2) { + real clock_in = pll_in(pll_out, mul, div); + if (valid_clock_in(clock_in) && valid_fcco(clock_in, mul, div)) { + clocks[dim(clocks)] = (clock) { + .clock_in = clock_in, + .mul = mul, + .div = div, + .pll_out = pll_out + }; + } + } + } + return clocks; +} + +#all_clocks(12.0); + +autoload Sort; + +void +dump_clocks(clock[] clocks) +{ + printf ("Clocks for %f\n", clocks[0].pll_out); + Sort::qsort(&clocks, bool func(clock a, clock b) { return a.clock_in > b.clock_in; }); + for (int i = 0; i < dim (clocks); i++) { + printf("\tclock_in %f mul %d div %d\n", + clocks[i].clock_in, + clocks[i].mul, + clocks[i].div); + } +} + +void +find_clocks() { + clock[] c40 = all_ins(40.0); + clock[] c48 = all_ins(48.0); + + dump_clocks(c40); + dump_clocks(c48); + for (int i40 = 0; i40 < dim(c40); i40++) { + for (int i48 = 0; i48 < dim(c48); i48++) { + if (c40[i40].clock_in == c48[i48].clock_in) + printf ("clock_in %f mul_40 %d div_40 %d mul_48 %d div_48 %d\n", + c40[i40].clock_in, + c40[i40].mul, + c40[i40].div, + c48[i48].mul, + c48[i48].div); + } + } +} + +find_clocks(); diff --git a/src/lpcxpresso/Makefile b/src/lpcxpresso/Makefile index 374c052f..2eef24ba 100644 --- a/src/lpcxpresso/Makefile +++ b/src/lpcxpresso/Makefile @@ -33,7 +33,7 @@ PRODUCT=LpcDemo-v0.0 PRODUCT_DEF=-DLPC_DEMO IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) PROG=lpc-demo.elf diff --git a/src/microkite/Makefile b/src/microkite/Makefile index 5eb97206..5b38f572 100644 --- a/src/microkite/Makefile +++ b/src/microkite/Makefile @@ -2,11 +2,8 @@ # Tiny AltOS build # # -vpath % ../attiny:../drivers:../kernel:../product:.. -vpath ao-make-product.5c ../util -vpath make-altitude-pa ../util - -include ../avr/Makefile.defs +TOPDIR=.. +include $(TOPDIR)/attiny/Makefile.defs PROGNAME=microkite-v0.1 PROG=$(PROGNAME)-$(VERSION).elf @@ -18,14 +15,6 @@ PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX) PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT) -MCU=attiny85 -DUDECPUTYPE=t85 -#PROGRAMMER=stk500v2 -P usb -LOADSLOW=-i 32 -B 32 -LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w: - -#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x - ALTOS_SRC = \ ao_micropeak.c \ ao_spi_attiny.c \ @@ -52,28 +41,18 @@ INC=\ ao_ms5607.h \ ao_log_micro.h \ ao_micropeak.h \ + ao_product.h \ altitude-pa.h IDPRODUCT=0 PRODUCT=MicroKite-v0.1 PRODUCT_DEF=-DMICROPEAK -CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product -CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY - -NICKLE=nickle +CFLAGS = $(PRODUCT_DEF) $(ATTINY_CFLAGS) SRC=$(ALTOS_SRC) OBJ=$(SRC:.c=.o) -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -all: $(PROG) $(HEX) microkite-load +all: $(PROG) $(HEX) $(SCRIPT) CHECK=sh ../util/check-avr-mem @@ -85,25 +64,16 @@ $(HEX): $(PROG) avr-size $(PROG) $(OBJCOPY) -R .eeprom -O ihex $(PROG) $@ - load: $(HEX) $(LOADCMD) $(LOADARG)$(HEX) load-slow: $(HEX) $(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - -ao_product.o: ao_product.c ao_product.h - -%.o : %.c $(INC) - $(call quiet,CC) -c $(CFLAGS) $< - distclean: clean clean: - rm -f *.o $(PROG) $(HEX) $(SCRIPT) + rm -f *.o *.elf *.ihx $(SCRIPT) rm -f ao_product.h publish: $(PUBLISH_HEX) $(PUBLISH_SCRIPT) @@ -120,10 +90,7 @@ load-product: load-product-slow: ./$(SCRIPT) slow -../altitude-pa.h: make-altitude-pa - nickle $< > $@ - -$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version +$(SCRIPT): $(SCRIPT).tmpl Makefile $(TOPDIR)/Makedefs sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1) chmod +x $@ @@ -131,4 +98,4 @@ install: uninstall: -$(OBJ): ao_product.h $(INC) +$(OBJ): $(INC) diff --git a/src/micropeak-v2.0/Makefile b/src/micropeak-v2.0/Makefile index c7d1b22d..6bac3e29 100644 --- a/src/micropeak-v2.0/Makefile +++ b/src/micropeak-v2.0/Makefile @@ -52,13 +52,14 @@ INC=\ ao_log_micro.h \ ao_micropeak.h \ altitude-pa.h \ + ao_product.h \ stm32f0.h IDPRODUCT=0x14 PRODUCT=MicroPeak-v2.0 PRODUCT_DEF=-DMICROPEAK -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=micropeak-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -72,12 +73,7 @@ all: $(PROG) $(HEX) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tmicropeak.ld -n $(PROG): Makefile $(OBJ) micropeak.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - -ao_product.o: ao_product.c ao_product.h + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) distclean: clean @@ -90,11 +86,8 @@ publish: $(PUBLISH_HEX) $(PUBLISH_HEX): $(HEX) cp -a $(HEX) $@ -../altitude-pa.h: make-altitude-pa - nickle $< > $@ - install: uninstall: -$(OBJ): ao_product.h $(INC) +$(OBJ): $(INC) diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile index f80d61b0..74769802 100644 --- a/src/micropeak/Makefile +++ b/src/micropeak/Makefile @@ -2,11 +2,8 @@ # Tiny AltOS build # # -vpath % ../attiny:../drivers:../kernel:../product:.. -vpath ao-make-product.5c ../util -vpath make-altitude-pa ../util - -include ../avr/Makefile.defs +TOPDIR=.. +include $(TOPDIR)/attiny/Makefile.defs PROGNAME=micropeak-v0.1 PROG=$(PROGNAME)-$(VERSION).elf @@ -18,14 +15,6 @@ PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX) PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT) -MCU=attiny85 -DUDECPUTYPE=t85 -#PROGRAMMER=stk500v2 -P usb -LOADSLOW=-i 32 -B 32 -LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w: - -#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x - ALTOS_SRC = \ ao_micropeak.c \ ao_spi_attiny.c \ @@ -52,28 +41,18 @@ INC=\ ao_ms5607.h \ ao_log_micro.h \ ao_micropeak.h \ + ao_product.h \ altitude-pa.h IDPRODUCT=0 PRODUCT=MicroPeak-v0.1 PRODUCT_DEF=-DMICROPEAK -CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product -CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY - -NICKLE=nickle +CFLAGS = $(PRODUCT_DEF) $(ATTINY_CFLAGS) SRC=$(ALTOS_SRC) OBJ=$(SRC:.c=.o) -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -all: $(PROG) $(HEX) micropeak-load +all: $(PROG) $(HEX) $(SCRIPT) CHECK=sh ../util/check-avr-mem @@ -85,21 +64,12 @@ $(HEX): $(PROG) avr-size $(PROG) $(OBJCOPY) -R .eeprom -O ihex $(PROG) $@ - load: $(HEX) $(LOADCMD) $(LOADARG)$(HEX) load-slow: $(HEX) $(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - -ao_product.o: ao_product.c ao_product.h - -%.o : %.c $(INC) - $(call quiet,CC) -c $(CFLAGS) $< - distclean: clean clean: @@ -120,10 +90,7 @@ load-product: load-product-slow: ./$(SCRIPT) slow -../altitude-pa.h: make-altitude-pa - nickle $< > $@ - -$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version +$(SCRIPT): $(SCRIPT).tmpl Makefile $(TOPDIR)/Makedefs sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1) chmod +x $@ @@ -131,4 +98,4 @@ install: uninstall: -$(OBJ): ao_product.h $(INC) +$(OBJ): $(INC) diff --git a/src/microsplash/Makefile b/src/microsplash/Makefile index 0342838e..4850ef14 100644 --- a/src/microsplash/Makefile +++ b/src/microsplash/Makefile @@ -2,11 +2,8 @@ # Tiny AltOS build # # -vpath % ../attiny:../drivers:../kernel:../product:.. -vpath ao-make-product.5c ../util -vpath make-altitude-pa ../util - -include ../avr/Makefile.defs +TOPDIR=.. +include $(TOPDIR)/attiny/Makefile.defs PROGNAME=microsplash-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -18,14 +15,6 @@ PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX) PUBLISH_SCRIPT=$(PUBLISH_DIR)/$(SCRIPT) -MCU=attiny85 -DUDECPUTYPE=t85 -#PROGRAMMER=stk500v2 -P usb -LOADSLOW=-i 32 -B 32 -LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w: - -#LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x - ALTOS_SRC = \ ao_micropeak.c \ ao_spi_attiny.c \ @@ -52,27 +41,17 @@ INC=\ ao_ms5607.h \ ao_log_micro.h \ ao_micropeak.h \ + ao_product.h \ altitude-pa.h IDPRODUCT=0 PRODUCT=MicroSplash-v1.0 PRODUCT_DEF=-DMICROPEAK -CFLAGS = $(PRODUCT_DEF) -I. -I../attiny -I../kernel -I.. -I../drivers -I../product -CFLAGS += -g -mmcu=$(MCU) -Wall -Wstrict-prototypes -O2 -mcall-prologues -DATTINY - -NICKLE=nickle +CFLAGS = $(PRODUCT_DEF) $(ATTINY_CFLAGS) SRC=$(ALTOS_SRC) OBJ=$(SRC:.c=.o) -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - all: $(PROG) $(HEX) $(SCRIPT) CHECK=sh ../util/check-avr-mem @@ -85,25 +64,16 @@ $(HEX): $(PROG) avr-size $(PROG) $(OBJCOPY) -R .eeprom -O ihex $(PROG) $@ - load: $(HEX) $(LOADCMD) $(LOADARG)$(HEX) load-slow: $(HEX) $(LOADCMD) $(LOADSLOW) $(LOADARG)$(HEX) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - -ao_product.o: ao_product.c ao_product.h - -%.o : %.c $(INC) - $(call quiet,CC) -c $(CFLAGS) $< - distclean: clean clean: - rm -f *.o $(PROG) $(HEX) $(SCRIPT) + rm -f *.o *.elf *.ihx $(SCRIPT) rm -f ao_product.h publish: $(PUBLISH_HEX) $(PUBLISH_SCRIPT) @@ -120,10 +90,7 @@ load-product: load-product-slow: ./$(SCRIPT) slow -../altitude-pa.h: make-altitude-pa - nickle $< > $@ - -$(SCRIPT): $(SCRIPT).tmpl Makefile ../Version +$(SCRIPT): $(SCRIPT).tmpl Makefile $(TOPDIR)/Makedefs sed -e 's/%HEX%/$(HEX)/' -e 's/%LOADCMD%/$(LOADCMD)/' -e 's/%LOADARG%/$(LOADARG)/' -e 's/%LOADSLOW%/$(LOADSLOW)/' $(SCRIPT).tmpl > $@ || (rm $@ && exit 1) chmod +x $@ @@ -131,4 +98,4 @@ install: uninstall: -$(OBJ): ao_product.h $(INC) +$(OBJ): $(INC) diff --git a/src/mpusb-v3.0/Makefile b/src/mpusb-v3.0/Makefile index 96156741..c09eedcf 100644 --- a/src/mpusb-v3.0/Makefile +++ b/src/mpusb-v3.0/Makefile @@ -38,7 +38,7 @@ PRODUCT=MicroPeakUSB-v3.0 PRODUCT_DEF=-DMPUSB IDPRODUCT=0x002b -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=mpusb-v3.0 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/nucleao-32/Makefile b/src/nucleao-32/Makefile index 1ab2eea1..fba99c88 100644 --- a/src/nucleao-32/Makefile +++ b/src/nucleao-32/Makefile @@ -58,7 +58,7 @@ PRODUCT=Nucleo-32 PRODUCT_DEF=-DNUCLEO IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tload.ld -n diff --git a/src/pnpservo-v1/Makefile b/src/pnpservo-v1/Makefile index 443a6afb..b3994a99 100644 --- a/src/pnpservo-v1/Makefile +++ b/src/pnpservo-v1/Makefile @@ -37,7 +37,7 @@ PRODUCT=PNPservo-v1 PRODUCT_DEF=-DPNPSERVO IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) -I. $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) -I. $(STMF0_CFLAGS) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tlambda.ld diff --git a/src/stm-bringup/Makefile b/src/stm-bringup/Makefile index b0943e56..53738771 100644 --- a/src/stm-bringup/Makefile +++ b/src/stm-bringup/Makefile @@ -7,12 +7,12 @@ endif TOPDIR=.. include $(TOPDIR)/Makedefs -CC=arm-none-eabi-gcc +CC=arm-none-eabicc OBJCOPY=arm-none-eabi-objcopy C_LIB=$(PDCLIB_LIBS_M3) -DEF_CFLAGS=-g -std=gnu99 -Os -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm $(PDCLIB_INCLUDES) +DEF_CFLAGS= -std=gnu99 -mlittle-endian -mthumb -ffreestanding -nostdlib -I. -I../stm $(PDCLIB_INCLUDES) # to run from SRAM LD_FLAGS_RAM=-L../stm -Wl,-Taltos-ram.ld diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile index ccce37a5..483d5784 100644 --- a/src/stm-demo/Makefile +++ b/src/stm-demo/Makefile @@ -44,7 +44,7 @@ PRODUCT=StmDemo-v0.0 PRODUCT_DEF=-DSTM_DEMO IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) PROG=stm-demo-$(VERSION) ELF=$(PROG).elf diff --git a/src/stm-flash/Makefile b/src/stm-flash/Makefile index 568ab85a..4b0a987a 100644 --- a/src/stm-flash/Makefile +++ b/src/stm-flash/Makefile @@ -30,7 +30,7 @@ PRODUCT=AltosFlash-$(VERSION) PRODUCT_DEF=-DALTOS_FLASH IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) PROG=altos-flash-$(VERSION).elf diff --git a/src/stm-scheme-newlib/Makefile b/src/stm-scheme-newlib/Makefile index 1db58f10..b02b762d 100644 --- a/src/stm-scheme-newlib/Makefile +++ b/src/stm-scheme-newlib/Makefile @@ -44,7 +44,7 @@ PRODUCT=StmScheme-v0.0 PRODUCT_DEF=-DSTM_SCHEME IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) PROG=stm-scheme-$(VERSION) ELF=$(PROG).elf diff --git a/src/stm-vga/Makefile b/src/stm-vga/Makefile index fa0d008f..fb73ba2c 100644 --- a/src/stm-vga/Makefile +++ b/src/stm-vga/Makefile @@ -53,7 +53,7 @@ ALTOS_SRC = \ PRODUCT=StmVga-v0.0 IDPRODUCT=0x000a -CFLAGS = $(STM_CFLAGS) -g -Os +CFLAGS = $(STM_CFLAGS) PROG=stm-vga-$(VERSION) ELF=$(PROG).elf diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs index 66ad1637..08a4b177 100644 --- a/src/stm/Makefile-flash.defs +++ b/src/stm/Makefile-flash.defs @@ -1,40 +1,4 @@ -vpath % $(TOPDIR)/stm:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR) -vpath ao-make-product.5c $(TOPDIR)/util - -.SUFFIXES: .elf .ihx - -.elf.ihx: - objcopy -O ihex $*.elf $@ - -ifndef VERSION -include $(TOPDIR)/Version -endif -include $(TOPDIR)/Makedefs - -CC=$(ARM_CC) -LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lc -lm -lgcc - -AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ - -DNEWLIB_INTEGER_PRINTF_SCANF \ - -I$(TOPDIR)/product -I$(TOPDIR) -isystem $(NEWLIB_NANO)/arm-none-eabi/include - -STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb \ - -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS) - -LDFLAGS=-L$(TOPDIR)/stm -Wl,-Taltos-loader.ld - -NICKLE=nickle - -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -.c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< +include $(TOPDIR)/stm/Makefile-stm.defs INC = \ ao.h \ @@ -69,7 +33,9 @@ PRODUCT=AltosFlash PRODUCT_DEF=-DALTOS_FLASH IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) + +LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Wl,-Taltos-loader.ld -n PROGNAME=altos-flash PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf @@ -77,9 +43,6 @@ PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf $(PROG): Makefile $(OBJ) altos-loader.ld $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) -ao_product.h: ao-make-product.5c $(TOPDIR)/Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - $(OBJ): $(INC) all: $(PROG) diff --git a/src/stm/Makefile-stm.defs b/src/stm/Makefile-stm.defs new file mode 100644 index 00000000..cce28f00 --- /dev/null +++ b/src/stm/Makefile-stm.defs @@ -0,0 +1,13 @@ +ifndef TOPDIR +TOPDIR=.. +endif + +include $(TOPDIR)/Makefile.defs + +vpath % $(TOPDIR)/stm:$(AO_VPATH) + +CC=$(ARM_CC) +LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lm -lc -lgcc + +STM_CFLAGS=-mlittle-endian -mcpu=cortex-m3 -mthumb \ + -I$(TOPDIR)/stm $(AO_CFLAGS) $(NEWLIB_CFLAGS) diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs index 2db534c2..26ba5824 100644 --- a/src/stm/Makefile.defs +++ b/src/stm/Makefile.defs @@ -1,56 +1,7 @@ -vpath % ../stm:../product:../drivers:../kernel:../util:../kalman:../aes:../math:../draw:../scheme:.. -vpath make-altitude ../util -vpath make-kalman ../util -vpath kalman.5c ../kalman -vpath kalman_filter.5c ../kalman -vpath load_csv.5c ../kalman -vpath matrix.5c ../kalman -vpath ao-make-product.5c ../util - -.SUFFIXES: .elf .ihx - -.elf.ihx: - $(ELFTOHEX) --output=$@ $*.elf - ifndef TOPDIR TOPDIR=.. endif -ifndef VERSION -include $(TOPDIR)/Version -endif -include $(TOPDIR)/Makedefs - -CC=$(ARM_CC) -LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7-m -lm -lc -lgcc - -WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ - -Wpointer-arith \ - -Wstrict-prototypes \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wnested-externs \ - -Wshadow - -AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I../draw \ - -DNEWLIB_INTEGER_PRINTF_SCANF \ - -I../lisp -I.. -isystem $(NEWLIB_NANO)/arm-none-eabi/include - -STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -Wcast-align \ - -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) - -LDFLAGS=-L../stm -Wl,-Taltos.ld -nostartfiles -Wl,-Map=$(PROGNAME).map - -NICKLE=nickle -ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex - -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) +include $(TOPDIR)/stm/Makefile-stm.defs -.c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< +LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Wl,-Taltos.ld -n diff --git a/src/stm32f4/Makefile-flash.defs b/src/stm32f4/Makefile-flash.defs index 1a2aa75c..bc5aa1ac 100644 --- a/src/stm32f4/Makefile-flash.defs +++ b/src/stm32f4/Makefile-flash.defs @@ -33,7 +33,7 @@ PRODUCT=AltosFlash PRODUCT_DEF=-DALTOS_FLASH IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STM32F4_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STM32F4_CFLAGS) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm32f4 -Wl,-Taltos-loader.ld @@ -52,9 +52,6 @@ $(PROG): Makefile $(OBJ) altos-loader.ld $(BIN): $(PROG) $(MAKEBIN) --output=$@ --base=$(FLASH_ADDR) $(PROG) -ao_product.h: ao-make-product.5c $(TOPDIR)/Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - $(OBJ): $(INC) distclean: clean diff --git a/src/stm32f4/Makefile-stm32f4.defs b/src/stm32f4/Makefile-stm32f4.defs index c39633c7..1c87b5b0 100644 --- a/src/stm32f4/Makefile-stm32f4.defs +++ b/src/stm32f4/Makefile-stm32f4.defs @@ -2,51 +2,12 @@ ifndef TOPDIR TOPDIR=.. endif -include $(TOPDIR)/Makedefs +include $(TOPDIR)/Makefile.defs -vpath % $(TOPDIR)/stm32f4:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR)/aes:$(TOPDIR):$(TOPDIR)/math -vpath make-altitude $(TOPDIR)/util -vpath make-kalman $(TOPDIR)/util -vpath kalman.5c $(TOPDIR)/kalman -vpath kalman_filter.5c $(TOPDIR)/kalman -vpath load_csv.5c $(TOPDIR)/kalman -vpath matrix.5c $(TOPDIR)/kalman -vpath ao-make-product.5c $(TOPDIR)/util +vpath % $(TOPDIR)/stm32f4:$(AO_VPATH) -.SUFFIXES: .elf .ihx - -.elf.ihx: - $(ELFTOHEX) --output=$@ $*.elf - -ifndef VERSION -include $(TOPDIR)/Version -endif - -ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex CC=$(ARM_CC) - -WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align - -AO_CFLAGS=-I. -I$(TOPDIR)/stm32f4 -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ - -Os -g \ - -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math \ - -isystem $(NEWLIB_NANO)/arm-none-eabi/include - -STM32F4_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m4 -mthumb \ - -mfloat-abi=hard -mfpu=fpv4-sp-d16 \ - -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) - -NICKLE=nickle - LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v7e-m/fpv4-sp/hard -lc -lm -lgcc -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -.c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< +STM32F4_CFLAGS=-mlittle-endian -mcpu=cortex-m4 -mthumb \ + -I$(TOPDIR)/stm32f4 $(AO_CFLAGS) $(NEWLIB_CFLAGS) diff --git a/src/stm32f4/Makefile.defs b/src/stm32f4/Makefile.defs index be185a59..8c0e8842 100644 --- a/src/stm32f4/Makefile.defs +++ b/src/stm32f4/Makefile.defs @@ -4,10 +4,4 @@ endif include $(TOPDIR)/stm32f4/Makefile-stm32f4.defs -LOADER=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf -MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin -FLASH_ADDR=0x08000000 - LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm32f4 -Wl,-Taltos.ld -n - -.DEFAULT_GOAL=all diff --git a/src/stmf0/Makefile-flash.defs b/src/stmf0/Makefile-flash.defs index 804595bd..b6e44990 100644 --- a/src/stmf0/Makefile-flash.defs +++ b/src/stmf0/Makefile-flash.defs @@ -33,7 +33,7 @@ PRODUCT=AltosFlash PRODUCT_DEF=-DALTOS_FLASH IDPRODUCT=0x000a -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Taltos-loader.ld @@ -51,9 +51,6 @@ $(PROG): Makefile $(OBJ) altos-loader.ld $(BIN): $(PROG) $(MAKEBIN) --output=$@ --base=$(FLASH_ADDR) $(PROG) - -ao_product.h: ao-make-product.5c $(TOPDIR)/Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ $(OBJ): $(INC) diff --git a/src/stmf0/Makefile-stmf0.defs b/src/stmf0/Makefile-stmf0.defs index 0438fc7b..5a883adf 100644 --- a/src/stmf0/Makefile-stmf0.defs +++ b/src/stmf0/Makefile-stmf0.defs @@ -2,56 +2,13 @@ ifndef TOPDIR TOPDIR=.. endif -include $(TOPDIR)/Makedefs +include $(TOPDIR)/Makefile.defs -vpath % $(TOPDIR)/stmf0:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/kernel:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR)/aes:$(TOPDIR):$(TOPDIR)/math -vpath make-altitude $(TOPDIR)/util -vpath make-kalman $(TOPDIR)/util -vpath kalman.5c $(TOPDIR)/kalman -vpath kalman_filter.5c $(TOPDIR)/kalman -vpath load_csv.5c $(TOPDIR)/kalman -vpath matrix.5c $(TOPDIR)/kalman -vpath ao-make-product.5c $(TOPDIR)/util +vpath % $(TOPDIR)/stmf0:$(AO_VPATH) -.SUFFIXES: .elf .ihx - -.elf.ihx: - $(ELFTOHEX) --output=$@ $*.elf - -ifndef VERSION -include $(TOPDIR)/Version -endif - -ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex CC=$(ARM_CC) -WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ - -Wpointer-arith \ - -Wstrict-prototypes \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wnested-externs \ - -Wshadow - -AO_CFLAGS=-I. -I$(TOPDIR)/stmf0 -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ - -DNEWLIB_INTEGER_PRINTF_SCANF \ - -I$(TOPDIR)/product -I$(TOPDIR) -I$(TOPDIR)/math \ - -isystem $(NEWLIB_NANO)/arm-none-eabi/include - -STMF0_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb\ - -ffreestanding -nostdlib $(AO_CFLAGS) $(WARN_FLAGS) - -NICKLE=nickle +STMF0_CFLAGS=-mlittle-endian -mcpu=cortex-m0 -mthumb\ + -I$(TOPDIR)/stmf0 $(AO_CFLAGS) $(NEWLIB_CFLAGS) LIBS=-L$(NEWLIB_NANO)/arm-none-eabi/lib/thumb/v6-m -lc -lm -lgcc - -V=0 -# The user has explicitly enabled quiet compilation. -ifeq ($(V),0) -quiet = @printf " $1 $2 $@\n"; $($1) -endif -# Otherwise, print the full command line. -quiet ?= $($1) - -.c.o: - $(call quiet,CC) -c $(CFLAGS) -o $@ $< diff --git a/src/stmf0/Makefile.defs b/src/stmf0/Makefile.defs index a0aa558b..2baba4f2 100644 --- a/src/stmf0/Makefile.defs +++ b/src/stmf0/Makefile.defs @@ -4,10 +4,10 @@ endif include $(TOPDIR)/stmf0/Makefile-stmf0.defs +LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Taltos.ld -n + LOADER=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin FLASH_ADDR=0x08000000 -LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Taltos.ld -n - .DEFAULT_GOAL=all diff --git a/src/teleballoon-v2.0/Makefile b/src/teleballoon-v2.0/Makefile index ddbfaf5f..4230d1b9 100644 --- a/src/teleballoon-v2.0/Makefile +++ b/src/teleballoon-v2.0/Makefile @@ -93,7 +93,7 @@ PRODUCT=TeleBalloon-v2.0 PRODUCT_DEF=-DTELEMETRUM_V_2_0 IDPRODUCT=0x000b -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=teleballoon-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -105,16 +105,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telebt-v3.0/Makefile b/src/telebt-v3.0/Makefile index 9892ad5f..49b70aaf 100644 --- a/src/telebt-v3.0/Makefile +++ b/src/telebt-v3.0/Makefile @@ -70,7 +70,7 @@ PRODUCT=TeleBT-v3.0 PRODUCT_DEF=-DTELEBT_V_3_0 IDPRODUCT=0x000e -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telebt-v3.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -82,13 +82,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telebt-v4.0/Makefile b/src/telebt-v4.0/Makefile index 4ad3287d..eba83fbc 100644 --- a/src/telebt-v4.0/Makefile +++ b/src/telebt-v4.0/Makefile @@ -51,7 +51,7 @@ PRODUCT=TeleBT-v4.0 PRODUCT_DEF=-DTELEBT_V_4_0 IDPRODUCT=0x000e -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=telebt-v4.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -63,13 +63,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/teledongle-v3.0/Makefile b/src/teledongle-v3.0/Makefile index a656cde5..abb97baf 100644 --- a/src/teledongle-v3.0/Makefile +++ b/src/teledongle-v3.0/Makefile @@ -46,7 +46,7 @@ PRODUCT=TeleDongle-v3.0 PRODUCT_DEF=-DTELEDONGLE IDPRODUCT=0x000c -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) PROGNAME=teledongle-v3.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -58,13 +58,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - load: $(PROG) lpc-load $(PROG) diff --git a/src/telefireeight-v1.0/Makefile b/src/telefireeight-v1.0/Makefile index 200c3150..1ec0dccf 100644 --- a/src/telefireeight-v1.0/Makefile +++ b/src/telefireeight-v1.0/Makefile @@ -59,7 +59,7 @@ PRODUCT=TeleFireEight-v1.0 PRODUCT_DEF=-DTELEFIREEIGHT_V_1_0 IDPRODUCT=0x000f -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME = telefireeight-v1.0 PROG = $(PROGNAME)-$(VERSION).elf @@ -71,13 +71,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telefireeight-v2.0/Makefile b/src/telefireeight-v2.0/Makefile index 7cc3720f..48a71231 100644 --- a/src/telefireeight-v2.0/Makefile +++ b/src/telefireeight-v2.0/Makefile @@ -58,7 +58,7 @@ PRODUCT=TeleFireEight-v2.0 PRODUCT_DEF=-DTELEFIREEIGHT_V_2_0 IDPRODUCT=0x000f -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME = telefireeight-v2.0 PROG = $(PROGNAME)-$(VERSION).elf @@ -70,13 +70,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telefireone-v1.0/Makefile b/src/telefireone-v1.0/Makefile index 773c8f69..94b8cd4e 100644 --- a/src/telefireone-v1.0/Makefile +++ b/src/telefireone-v1.0/Makefile @@ -64,7 +64,7 @@ PRODUCT=TeleFireOne-v1.0 PRODUCT_DEF=-DTELEFIREONE_V_1_0 IDPRODUCT=0x000f -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME = telefireone-v1.0 PROG = $(PROGNAME)-$(VERSION).elf diff --git a/src/telefiretwo-v0.1/Makefile b/src/telefiretwo-v0.1/Makefile index 72171fac..a462d5b5 100644 --- a/src/telefiretwo-v0.1/Makefile +++ b/src/telefiretwo-v0.1/Makefile @@ -58,7 +58,7 @@ PRODUCT=TeleFire-v0.1 PRODUCT_DEF=-DTELEFIRETWO_V_0_1 IDPRODUCT=0x000f -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME = telefiretwo-v0.1 PROG = $(PROGNAME)-$(VERSION).elf @@ -70,13 +70,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telefiretwo-v0.2/Makefile b/src/telefiretwo-v0.2/Makefile index f43ece71..d48dcc37 100644 --- a/src/telefiretwo-v0.2/Makefile +++ b/src/telefiretwo-v0.2/Makefile @@ -59,7 +59,7 @@ PRODUCT=TeleFire-v0.2 PRODUCT_DEF=-DTELEFIRETWO_V_0_2 IDPRODUCT=0x000f -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME = telefiretwo-v0.2 PROG = $(PROGNAME)-$(VERSION).elf diff --git a/src/telegps-v0.1/Makefile b/src/telegps-v0.1/Makefile index 0365f91f..90fd8a50 100644 --- a/src/telegps-v0.1/Makefile +++ b/src/telegps-v0.1/Makefile @@ -75,7 +75,7 @@ PRODUCT=TeleGPS-v0.1 PRODUCT_DEF=-DTELEGPS IDPRODUCT=0x0025 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telegps-v0.1 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile index 834609d9..73d8c245 100644 --- a/src/telegps-v0.3/Makefile +++ b/src/telegps-v0.3/Makefile @@ -56,7 +56,7 @@ PRODUCT=TeleGPS-v0.3 PRODUCT_DEF=-DTELEGPS IDPRODUCT=0x0025 -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) PROGNAME=telegps-v0.3 PROG=$(PROGNAME)-$(VERSION).elf @@ -68,13 +68,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telegps-v1.0/Makefile b/src/telegps-v1.0/Makefile index 76dc0371..fc1b1f28 100644 --- a/src/telegps-v1.0/Makefile +++ b/src/telegps-v1.0/Makefile @@ -59,7 +59,7 @@ PRODUCT=TeleGPS-v1.0 PRODUCT_DEF=-DTELEGPS IDPRODUCT=0x0025 -CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) $(PROFILE_DEF) PROGNAME=telegps-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -71,13 +71,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telegps-v2.0/Makefile b/src/telegps-v2.0/Makefile index 617efa65..7ce28471 100644 --- a/src/telegps-v2.0/Makefile +++ b/src/telegps-v2.0/Makefile @@ -3,7 +3,9 @@ # # -include ../stmf0/Makefile.defs +TOPDIR=.. + +include $(TOPDIR)/stmf0/Makefile.defs INC = \ ao.h \ @@ -59,7 +61,7 @@ PRODUCT=TeleGPS-v2.0 PRODUCT_DEF=-DTELEGPS IDPRODUCT=0x0025 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) $(PROFILE_DEF) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) $(PROFILE_DEF) PROGNAME=telegps-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -75,9 +77,6 @@ $(PROG): Makefile $(OBJ) altos.ld $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telelco-v0.2-cc1200/Makefile b/src/telelco-v0.2-cc1200/Makefile index 9307aa2d..04f3b8ff 100644 --- a/src/telelco-v0.2-cc1200/Makefile +++ b/src/telelco-v0.2-cc1200/Makefile @@ -76,7 +76,7 @@ PRODUCT=TeleLCO-v0.2 PRODUCT_DEF=-DTELELCO IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME=telelco-v0.2 PROG=$(PROGNAME)-$(VERSION).elf @@ -88,16 +88,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude.h: make-altitude - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telelco-v0.2/Makefile b/src/telelco-v0.2/Makefile index 91ae67f0..2b8af054 100644 --- a/src/telelco-v0.2/Makefile +++ b/src/telelco-v0.2/Makefile @@ -70,10 +70,10 @@ ALTOS_SRC = \ ao_radio_cmac_cmd.c PRODUCT=TeleLCO-v0.2 -PRODUCT_DEF=-DTELEMEGA +PRODUCT_DEF=-DTELELCO IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME=telelco-v0.2 PROG=$(PROGNAME)-$(VERSION).elf @@ -85,16 +85,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude.h: make-altitude - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telelco-v0.3/Makefile b/src/telelco-v0.3/Makefile index 567ddf41..87e5d72d 100644 --- a/src/telelco-v0.3/Makefile +++ b/src/telelco-v0.3/Makefile @@ -74,7 +74,7 @@ PRODUCT=TeleLCO-v0.3 PRODUCT_DEF=-DTELELCO IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME=telelco-v0.3 PROG=$(PROGNAME)-$(VERSION).elf @@ -86,16 +86,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude.h: make-altitude - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telelco-v2.0/Makefile b/src/telelco-v2.0/Makefile index 43295fd3..1ae5981f 100644 --- a/src/telelco-v2.0/Makefile +++ b/src/telelco-v2.0/Makefile @@ -76,7 +76,7 @@ PRODUCT=TeleLCO-v2.0 PRODUCT_DEF=-DTELELCO IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME=telelco-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -88,13 +88,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telelcotwo-v0.1/Makefile b/src/telelcotwo-v0.1/Makefile index 6a114aae..c0a90d9d 100644 --- a/src/telelcotwo-v0.1/Makefile +++ b/src/telelcotwo-v0.1/Makefile @@ -67,7 +67,7 @@ PRODUCT=TeleLCOTwo-v0.1 PRODUCT_DEF=-DTELELCOTWO IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) PROGNAME=telelcotwo-v0.1 PROG=$(PROGNAME)-$(VERSION).elf @@ -79,13 +79,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemega-v0.1/Makefile b/src/telemega-v0.1/Makefile index fde35aae..3357a92b 100644 --- a/src/telemega-v0.1/Makefile +++ b/src/telemega-v0.1/Makefile @@ -104,7 +104,7 @@ PRODUCT=TeleMega-v0.1 PRODUCT_DEF=-DTELEMEGA IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemega-v0.1 PROG=$(PROGNAME)-$(VERSION).elf @@ -116,16 +116,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemega-v1.0/Makefile b/src/telemega-v1.0/Makefile index 62eda4ad..c88ff42f 100644 --- a/src/telemega-v1.0/Makefile +++ b/src/telemega-v1.0/Makefile @@ -106,7 +106,7 @@ PRODUCT=TeleMega-v1.0 PRODUCT_DEF=-DTELEMEGA IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemega-v1.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -118,16 +118,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemega-v2.0/Makefile b/src/telemega-v2.0/Makefile index 78829fff..6c84792e 100644 --- a/src/telemega-v2.0/Makefile +++ b/src/telemega-v2.0/Makefile @@ -105,7 +105,7 @@ PRODUCT=TeleMega-v2.0 PRODUCT_DEF=-DTELEMEGA IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemega-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -117,16 +117,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemega-v3.0/Makefile b/src/telemega-v3.0/Makefile index b449b397..87a59c64 100644 --- a/src/telemega-v3.0/Makefile +++ b/src/telemega-v3.0/Makefile @@ -102,7 +102,7 @@ PRODUCT=TeleMega-v3.0 PRODUCT_DEF=-DTELEMEGA IDPRODUCT=0x0023 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemega-v3.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -114,16 +114,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemetrum-v2.0/Makefile b/src/telemetrum-v2.0/Makefile index e0192f61..c1e220e3 100644 --- a/src/telemetrum-v2.0/Makefile +++ b/src/telemetrum-v2.0/Makefile @@ -93,7 +93,7 @@ PRODUCT=TeleMetrum-v2.0 PRODUCT_DEF=-DTELEMETRUM_V_2_0 IDPRODUCT=0x000b -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemetrum-v2.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -105,16 +105,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemetrum-v3.0/Makefile b/src/telemetrum-v3.0/Makefile index 071fd8dd..fb379aa7 100644 --- a/src/telemetrum-v3.0/Makefile +++ b/src/telemetrum-v3.0/Makefile @@ -93,7 +93,7 @@ PRODUCT=TeleMetrum-v3.0 PRODUCT_DEF=-DTELEMETRUM_V_3_0 IDPRODUCT=0x000b -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=telemetrum-v3.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -105,16 +105,10 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) altos.ld - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -../altitude-pa.h: make-altitude-pa - nickle $< > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ - distclean: clean clean: diff --git a/src/telemini-v3.0/Makefile b/src/telemini-v3.0/Makefile index 4713b3ad..1ed25c18 100644 --- a/src/telemini-v3.0/Makefile +++ b/src/telemini-v3.0/Makefile @@ -60,7 +60,7 @@ PRODUCT=TeleMini-v3.0 PRODUCT_DEF=-DTELEMINI_V_3_0 IDPRODUCT=0x0027 -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=telemini-v3.0 PROG=$(PROGNAME)-$(VERSION).elf @@ -72,10 +72,7 @@ OBJ=$(SRC:.c=.o) all: $(PROG) $(HEX) $(PROG): Makefile $(OBJ) - $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS) - -ao_product.h: ao-make-product.5c ../Version - $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ + $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS) $(OBJ): $(INC) diff --git a/src/tmgps-v2.0/Makefile b/src/tmgps-v2.0/Makefile index 8a1293d2..015fea7f 100644 --- a/src/tmgps-v2.0/Makefile +++ b/src/tmgps-v2.0/Makefile @@ -84,7 +84,7 @@ PRODUCT=TMGPS-v2.0 PRODUCT_DEF=-DTMGPS_V_2_0 IDPRODUCT=0x0025 -CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF) PROGNAME=tmgps-v2.0 PROG=$(PROGNAME)-$(VERSION).elf diff --git a/src/vidtime/Makefile b/src/vidtime/Makefile index 327614bc..f8e47a3f 100644 --- a/src/vidtime/Makefile +++ b/src/vidtime/Makefile @@ -35,7 +35,7 @@ PRODUCT=VidTime PRODUCT_DEF=-DVIDTIME IDPRODUCT=0x002b -CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -Os -g +CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) PROGNAME=vidtime-v1.0 PROG=$(PROGNAME)-$(VERSION).elf -- 2.30.2