X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=32a72cbcfa00d8eea1e95d85a30a0926d9729fb1;hp=f6a221bf3d4db6f47da4bc85f418e6535a2abc1e;hb=ccf5eca095c0c0bed2a25e945c3c3b48cf3b55c7;hpb=a07ee5d1ce0e6c0f5e53a04afed88a96b323177a

diff --git a/firmware/Makefile b/firmware/Makefile
index f6a221b..32a72cb 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,6 +1,5 @@
 
 #include `uname`.mak
-
 GOODFET?=/dev/ttyUSB0
 
 
@@ -17,12 +16,12 @@ mcu?=msp430x1612
 GCCINC=-T ldscripts/$(mcu).x
 
 CCEXTRA?=
-CC=msp430-gcc -Wall -g -mmcu=$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
+CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -DGCC $(GCCINC) -I include $(CCEXTRA)
 
 #Define extra modules here.
-moreapps?=
+moreapps?=apps/i2c/i2c.o apps/chipcon/chipcon.o
 
-apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o apps/i2c/i2c.o apps/chipcon/chipcon.o apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o
+apps= $(moreapps) apps/monitor/monitor.o apps/spi/spi.o   apps/jtag/jtag.o apps/jtag/jtag430.o apps/jtag/jtag430x2.o apps/avr/avr.o
 libs= lib/$(mcu).o lib/command.o apps/jtag/jtag430asm.o
 app= goodfet
 
@@ -34,9 +33,9 @@ run:
 	../client/goodfet.msp430 test
 
 install: $(app).hex
-	$(BSL) -e
-	ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
-	$(BSL) -p $(app).hex 
+	#$(BSL) -e
+	#ls info.txt && $(BSL) -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(BSL) -e -p $(app).hex 
 verify:
 	$(BSL) -P $(app).hex -v $(app).hex
 dumpinfo: