From c3b2767ddf20def72ede1745f03e4cb949bb8288 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 25 Jan 2008 03:58:28 +0100 Subject: [PATCH] update Makefile to use intel2950-4.eecs.berkeley.edu --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0a6cd9e..df5384b 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src #remote_xilinx = /opt/ISE81/ #remote_dir = fleet/ -host = intel2950-5.eecs.berkeley.edu +host = intel2950-4.eecs.berkeley.edu remote_xilinx = /scratch/megacz/xilinx/ remote_dir = /scratch/megacz/fleet/ @@ -69,9 +69,9 @@ upload: fleet.jar build/fpga/main.bit uploadtest: make upload - $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests + $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship testmegacz: - $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests + $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java make fleet.jar @@ -105,8 +105,8 @@ synth: -test: fleet.jar; $(java) -jar fleet.jar test ships/*.ship tests -testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests +test: fleet.jar; $(java) -jar fleet.jar test tests ships/*.ship +testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests ships/*.ship generate: fleet.jar $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/ -- 1.7.10.4