X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=cb27fde60f606e89547fd31b9b04ccfa3b52bc8d;hp=a3b7cfc6327185ba3d0c0ddb637c8c85570354cc;hb=ae9b57f20c3b9165c11a48fb51c772a5a4d05a11;hpb=c267c64141b4cafb1cd1b4d7e897f3fdca27d7c6

diff --git a/firmware/Makefile b/firmware/Makefile
index a3b7cfc..cb27fde 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,31 +1,37 @@
 
 #include `uname`.mak
-GOODFET?=/dev/ttyUSB0
+GOODFET?=/dev/tty.usbser*
 
+#For Arduino,
+#BSL?=avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 #For tos-bsl, use --invert-reset --invert-test
-BSL?=goodfet.bsl --speed=38400
+MSP430BSL?=goodfet.bsl --speed=38400
 
 #One of these should be defined explicitly.
 #Default removed because of confusion.
 
-#mcu=msp430x2274
-mcu=msp430x2618
+#mcu?=msp430x2274
+#mcu?=msp430x2618
 #mcu?=msp430x1612
-#mcu?=RUNCONFIG
-
-#platform=goodfet
-#platform=telosb
-#platform=z1
-#platform=nhbadge
-#platform=nhbadgeb
+#mcu?=atmega168
+mcu?=RUNCONFIG
+
+#platform?=goodfet
+#platform?=telosb
+#platform?=z1
+#platform?=nhbadge
+#platform?=nhbadgeb
+#platofrm?=arduino
 platform?=goodfet
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.
-#GCCINC=-T ldscripts/161x.x
-GCCINC=-T ldscripts/$(mcu).x
+GCCINC?=
+
+#GCC?=avr-gcc
+GCC?=msp430-gcc -T ldscripts/$(mcu).x
 
-CCEXTRA?=
-CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms $(CCEXTRA)
+CCEXTRA?=  -D$(mcu) -D$(platform) -Dplatform=$(platform) -DGCC $(GCCINC) -I include -I platforms
+CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -97,11 +103,11 @@ CC=msp430-gcc -Wall -Os -g -mmcu=$(mcu) -D$(mcu) -D$(platform) -Dplatform=$(plat
 # config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
 
 # New default.
-config ?= monitor chipcon ccspi nrf spi jtagarm7 jtag430 jtag430x2 avr openocd
+config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd 
 
 # Build the needed list of app and lib object files from the config
 apps= 
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
 hdrs=
 ERR=
 
@@ -314,14 +320,17 @@ goodfet.hex: goodfet
 run:
 	../client/goodfet.msp430 test
 
+avrinstall: $(app).hex
+	#to be merged
+	avrdude -V -F -c stk500v1 -p m328p -b 57600 -P $(GOODFET) -U flash:w:$(app).hex
 install: $(app).hex
-	$(BSL) -e -p $(app).hex 
+	$(MSP430BSL) -e -p $(app).hex 
 installinfo:
-	$(BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
+	$(MSP430BSL) -P $(app).hex -p info.txt || true  #MSP430F2xx targets only, inelegant.
 verify:
-	$(BSL) -P $(app).hex -v $(app).hex
+	$(MSP430BSL) -P $(app).hex -v $(app).hex
 dumpinfo:
-	$(BSL) --dumpinfo
+	$(MSP430BSL) --dumpinfo
 $(app).c: config builddate appsfiles err
 $(app): $(libs) $(apps)
 $(app).hex: $(app)
@@ -329,7 +338,7 @@ $(app).hex: $(app)
 m4s: $(app).hex
 	msp430-objdump -D -m msp430 $(app).hex | m4s init
 erase:
-	$(BSL) -e 
+	$(MSP430BSL) -e 
 clean:
 	rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs: