X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymega-v3.0%2FMakefile;h=c145b83b2a8557990416a6e64393e4c0fde40a56;hb=HEAD;hp=51c517558fff12442fae7b3853b03c8e46141fe9;hpb=28618a728e85b70ecac73983531894a25e90d7f6;p=fw%2Faltos

diff --git a/src/easymega-v3.0/Makefile b/src/easymega-v3.0/Makefile
index 51c51755..f745e45e 100644
--- a/src/easymega-v3.0/Makefile
+++ b/src/easymega-v3.0/Makefile
@@ -3,7 +3,7 @@
 #
 #
 
-include ../stm/Makefile.defs
+include ../stm32f1/Makefile.defs
 
 INC = \
 	ao.h \
@@ -20,38 +20,27 @@ INC = \
 	ao_ms5607.h \
 	ao_bmx160.h \
 	ao_adxl375.h \
-	ao_profile.h \
 	ao_task.h \
 	ao_whiten.h \
 	ao_sample_profile.h \
 	ao_quaternion.h \
-	ao_mpu.h \
-	stm32l.h \
+	stm32f1.h \
 	Makefile
 
 #
 # Common AltOS sources
 #
 
-#PROFILE=ao_profile.c
-#PROFILE_DEF=-DAO_PROFILE=1
-
-#SAMPLE_PROFILE=ao_sample_profile.c \
-#	ao_sample_profile_timer.c
-#SAMPLE_PROFILE_DEF=-DHAS_SAMPLE_PROFILE=1
-
-#STACK_GUARD=ao_mpu_stm.c
-#STACK_GUARD_DEF=-DHAS_STACK_GUARD=1
-
 ALTOS_SRC = \
 	ao_boot_chain.c \
 	ao_interrupt.c \
+	ao_clock.c \
 	ao_product.c \
 	ao_romconfig.c \
 	ao_cmd.c \
 	ao_config.c \
 	ao_task.c \
-	ao_led_stm.c \
+	ao_led.c \
 	ao_stdio.c \
 	ao_panic.c \
 	ao_timer.c \
@@ -60,19 +49,19 @@ ALTOS_SRC = \
 	ao_freq.c \
 	ao_dma_stm.c \
 	ao_spi_stm.c \
+	ao_i2c_stm.c \
 	ao_data.c \
 	ao_ms5607.c \
-	ao_bmx160.c \
+	ao_bmi088.c \
+	ao_mmc5983.c \
 	ao_adxl375.c \
 	ao_adc_stm.c \
 	ao_beep_stm.c \
-	ao_eeprom_stm.c \
 	ao_storage.c \
 	ao_m25.c \
 	ao_usb_stm.c \
 	ao_exti_stm.c \
 	ao_report.c \
-	ao_i2c_stm.c \
 	ao_convert_pa.c \
 	ao_convert_volt.c \
 	ao_log.c \
@@ -90,22 +79,38 @@ PRODUCT=EasyMega-v3.0
 PRODUCT_DEF=-DEASYMEGA
 IDPRODUCT=0x0028
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(STACK_GUARD_DEF)
+CFLAGS = $(PRODUCT_DEF) $(STM32F1_CFLAGS)
 
 PROGNAME=easymega-v3.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_DFU=$(PROGNAME)-combined-$(VERSION).dfu
+BOTH_HEX=$(PROGNAME)-combined-$(VERSION).ihx
+ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex
+MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
 
 SRC=$(ALTOS_SRC) ao_easymega.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_DFU) $(BOTH_HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
 	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
+$(BOTH_DFU): $(PROG) $(FLASH_PROG)
+	$(MAKEBIN) --dfu --output=$@ --base=$(FLASH_ADDR) $(FLASH_PROG) $(PROG)
+
+$(BOTH_HEX): $(PROG) $(FLASH_PROG)
+	$(ELFTOHEX) --nosym --output=$@ $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
 $(OBJ): $(INC)
 
+FRC:
+
 distclean:	clean
 
 clean: