[tuxdroid-svn] r1312 - firmware/rf/trunk

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2008-07-08 10:30:39 +0200 (Tue, 08 Jul 2008)
New Revision: 1312

Modified:
   firmware/rf/trunk/Makefile
Log:
* 'make prog' now compiles and programs both firmware.


Modified: firmware/rf/trunk/Makefile
===================================================================
--- firmware/rf/trunk/Makefile	2008-07-08 08:29:16 UTC (rev 1311)
+++ firmware/rf/trunk/Makefile	2008-07-08 08:30:39 UTC (rev 1312)
@@ -112,7 +112,7 @@
 ## Clean target
 .PHONY: clean
 clean:
-	-rm -rf $(OBJECTS) main.elf dep/* $(PROJECT).* svnrev.h
+	-rm -rf $(OBJECTS) main.elf dep/* $(PROJECT).{elf,lss} svnrev.h
 
 
 ## Other dependencies
@@ -120,7 +120,11 @@
 
 # Programming
 prog: $(PROJECT).hex
-	tuxup $(PROJECT).hex $(PROJECT).eep
+	make TYPE=master clean
+	make TYPE=master
+	make TYPE=slave clean
+	make TYPE=slave
+	tuxup fuxrf.hex tuxrf.hex
 
 dwen:
 	$(AVRDUDE) -p $(MCU) -c jtag2isp -P usb -B 10 -U hfuse:w:0x95:m