X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=5e2c5a305864bd533d5a68dca8b6da8d05ff1e2a;hp=c77467e22d7169f1d4ae30d1bf1869f554b452e4;hb=f4a366d95f96109559f0903611d7103c50cde3f7;hpb=dbcf2c6f85fc4277cc39f6c17cf8b8a4e8f94991;ds=sidebyside

diff --git a/firmware/Makefile b/firmware/Makefile
index c77467e..5e2c5a3 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -37,11 +37,11 @@ CC =$(GCC) -Wall -O1 -fno-strict-aliasing -g   $(CCEXTRA)
 # ALPHA:
 # jtag430 -- 16-bit MSP430 JTAG
 # jtag430x2 -- 20-bit MSP430 JTAG
+# jtagarm7 -- ARM7TDMI JTAG
 
 # PRE-ALPHA:
 #  Bus protocols:
 # i2c -- Turns GF into USB-to-i2c adapter
-# jtagarm7 -- ARM7TDMI JTAG
 # ejtag -- MIPS JTAG
 # jtagxscale -- XScale JTAG
 # openocd -- OpenOCD bitbang device
@@ -52,9 +52,11 @@ CC =$(GCC) -Wall -O1 -fno-strict-aliasing -g   $(CCEXTRA)
 # pic -- PIC24H/dsPIC33F debugger
 # adc -- ADC10 (still specific to x2274, GoodFET32)
 
-#  Radios:
+#  Radions:
 # nrf -- Nordic RF SPI
 # ccspi -- Chipcon SPI
+# cc2500 -- Chipcon SPI CC2500
+# atmel_radio -- Atmel radio
 
 # Miscelaneous:
 # glitch -- Glitch research tool
@@ -260,12 +262,24 @@ ifeq ($(filter ccspi, $(config)), ccspi)
 	hdrs+= ccspi.h
 endif
 
+# include chipcon CC2500 radio spi app
+ifeq ($(filter cc2500, $(config)), cc2500)
+	apps+= apps/radios/cc2500.o
+	hdrs+= cc2500.h
+endif
+
 # include nrf app
 ifeq ($(filter nrf, $(config)), nrf)
 	apps+= apps/radios/nrf.o
 	hdrs+= nrf.h
 endif
 
+# include atmel_radio app
+ifeq ($(filter atmel_radio, $(config)), atmel_radio)
+	apps+= apps/radios/atmel_radio.o
+	hdrs+= atmel_radio.h
+endif
+
 # include glitch app
 ifeq ($(filter glitch, $(config)), glitch)
 	apps+= apps/glitch/glitch.o
@@ -316,7 +330,11 @@ run:
 
 avrinstall: $(app).hex
 	#to be merged
+ifdef AVR_PLATFORM
+	avrdude -V -F -c stk500v1 -p $(AVR_PLATFORM) -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
+else
 	avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
+endif
 
 ifeq ($(platform),tilaunchpad)
 install: $(app).hex
@@ -327,6 +345,10 @@ erase:
 	$(JTAG) -e $(app).hex
 else
 install: $(app).hex
+	#Note that 'make install' no longer erases the chip.
+	#Use 'make reinstall' if you want that.
+	$(MSP430BSL) -p $(app).hex
+reinstall: $(app).hex
 	$(MSP430BSL) -e -p $(app).hex
 installinfo:
 	$(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.