X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fmicropeak-v2.0%2FMakefile;h=6bac3e2917cef292ab84ebe2d703abdbc0e0f371;hb=HEAD;hp=c7d1b22d374a28caddfc698e19b81f8b39ba1af8;hpb=2cdb1f30c49ba460b0850d23ba9c85e0336af290;p=fw%2Faltos

diff --git a/src/micropeak-v2.0/Makefile b/src/micropeak-v2.0/Makefile
index c7d1b22d..28aba585 100644
--- a/src/micropeak-v2.0/Makefile
+++ b/src/micropeak-v2.0/Makefile
@@ -3,7 +3,7 @@
 #
 #
 
-include ../stmf0/Makefile.defs
+include ../stm32l0/Makefile.defs
 
 PUBLISH_DIR=$(HOME)/altusmetrumllc/Binaries
 PUBLISH_HEX=$(PUBLISH_DIR)/$(HEX)
@@ -14,34 +14,6 @@ MICRO_SRC=\
 	ao_microflight.c \
 	ao_microkalman.c
 
-ALTOS_SRC = \
-	ao_micropeak.c \
-	ao_spi_stm.c \
-	ao_dma_stm.c \
-	ao_led_stmf0.c \
-	ao_timer.c \
-	ao_ms5607.c \
-	ao_exti_stm.c \
-	ao_convert_pa.c \
-	ao_romconfig.c \
-	ao_product.c \
-	ao_panic.c \
-	ao_stdio.c \
-	ao_serial_stm.c \
-	ao_usb_stm.c \
-	ao_mutex.c \
-	ao_interrupt.c \
-	ao_cmd.c \
-	ao_task.c \
-	ao_data.c \
-	ao_boot_chain.c \
-	ao_microflight.c \
-	ao_report_micro.c \
-	ao_storage_stm.c \
-	ao_storage.c \
-	ao_log_micro.c \
-	ao_microkalman.c
-
 INC=\
 	ao.h \
 	ao_pins.h \
@@ -51,14 +23,40 @@ INC=\
 	ao_ms5607.h \
 	ao_log_micro.h \
 	ao_micropeak.h \
+	ao_lpuart.h \
 	altitude-pa.h \
-	stm32f0.h
+	ao_product.h \
+	stm32l0.h
+
+ALTOS_SRC = \
+	ao_interrupt.c \
+	ao_panic.c \
+	ao_micro.c \
+	ao_report_micro.c \
+	ao_stdio.c \
+	ao_notask.c \
+	ao_serial_stm.c \
+	ao_lpuart_stm.c \
+	ao_timer.c \
+	ao_spi_stm32l0.c \
+	ao_adc_stm32l0.c \
+	ao_ms5607.c \
+	ao_exti_stm.c \
+	ao_convert_pa.c \
+	ao_led.c \
+	ao_cmd.c \
+	ao_product.c \
+	ao_romconfig.c \
+	ao_flash_stm32l0.c \
+	ao_microflight.c \
+	ao_log_micro.c \
+	ao_microkalman.c
 
 IDPRODUCT=0x14
 PRODUCT=MicroPeak-v2.0
 PRODUCT_DEF=-DMICROPEAK
 
-CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
+CFLAGS = $(PRODUCT_DEF) $(STML0_CFLAGS) -Wl,--gc-sections -ffunction-sections -fdata-sections
 
 PROGNAME=micropeak-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
@@ -69,20 +67,15 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
-LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Tmicropeak.ld -n
+LDFLAGS=-nostartfiles $(CFLAGS) -L$(TOPDIR)/stm32l0 -Taltos.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) -Wl,-Map=$(PROGNAME)-$(VERSION).map
 
 distclean:	clean
 
 clean:
-	rm -f *.o *.elf *.ihx
+	rm -f *.o *.elf *.ihx *.map
 	rm -f ao_product.h
 
 publish: $(PUBLISH_HEX)
@@ -90,11 +83,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)