Makefile tweaks

diff --git a/Makefile b/Makefile
index a13ec23..1393c48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,13 @@ verilog_files += $(shell find src -name \*.inc)
 runfpga: fleet.jar
        $(java) -jar fleet.jar target=fpga run
 
-mrunfpga: fleet.jar build/main.bit
+upload: fleet.jar build/main.bit
        mkdir -p build
        rsync -zare ssh --progress --verbose build/main.bit root@bee441.cs.berkeley.edu:/var/slipway/megacz.bit
-       $(java) -jar fleet.jar bitfile=megacz.bit target=fpga test tests
+
+uploadtest:
+       make upload
+       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests
 
 build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
        make fleet.jar