X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7b027e2e1f20e15796ee61648e4752a5e099c3a5;hb=f17df62ee603a39a5ff8d499dfaf0a6d8fe19353;hp=74aff2b4c29f219431574425ef559fb361536018;hpb=34034deb0fa8442be7ebf5911dcb0847b7462a03;p=slipway.git

diff --git a/Makefile b/Makefile
index 74aff2b..7b027e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,151 @@
+ifeq ($(shell uname),Darwin)
+linkerflags = -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -dynamiclib -framework JavaVM
+jnilib      = libFtdiUartNative.jnilib
+else
+linkerflags =
+jnilib      = libFtdiUartNative.so
+endif
 
-java = java -Djava.library.path=$(shell pwd)/lib/ -cp lib/RXTXcomm.jar:obits.jar
+## demos ############################################################################
 
-led0: obits.jar 
-	$(java) edu.berkeley.obits.AtmelSerial < bitstreams/led0.md4
+asyncdemo: slipway.jar 
+	java -cp slipway.jar edu.berkeley.slipway.demos.FastestMicropipelineFifoDemo misc/data/async/
 
-led1: obits.jar
-	$(java) edu.berkeley.obits.AtmelSerial < bitstreams/led1.md4
+demo: slipway.jar 
+	java -cp slipway.jar edu.berkeley.slipway.demos.Demo 30
 
-run: obits.jar
-	$(java) edu.berkeley.obits.AtmelSerial < stupid.md4
+demo2: slipway.jar 
+	java -cp slipway.jar edu.berkeley.slipway.demos.Demo2 30
 
-obits.jar: $(shell find src -name \*.java)
-	javac -cp lib/RXTXcomm.jar -d build $(shell find src -name \*.java)
-	cd build; jar cvf ../$@ .
+mpardemo: upstream/jhdl-edifparser.jar slipway.jar
+	iverilog  -t fpga -s main -o out.edf misc/mpardemo.v
+	java -cp slipway.jar:upstream/jhdl-edifparser.jar edu.berkeley.slipway.mpar.MPARDemo out.edf
 
-# -O3 is required; otherwise the poor AVR can't keep up with us!
-avrdrone.hex: src/edu/berkeley/obits/device/atmel/AvrDrone.c
-	avr-gcc -O3 -mmcu=at94k $<
-	avr-objcopy -O ihex a.out $@
 
-demo: ftdi.jar
-	java -cp ftdi.jar edu.berkeley.obits.device.atmel.Demo
+## slipway ############################################################################
 
-src/com/ftdi/usb/ftdi_wrap.c: src/com/ftdi/usb/ftdi.i
-	mkdir -p build
+build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
+	mkdir -p `dirname $@`
 	mkdir -p src/com/ftdi/usb
-	swig -noproxy -package com.ftdi.usb -outdir src/com/ftdi/usb -java $<
+	swig -module FtdiUartNative -noproxy -package com.ftdi.usb -o $@ -outdir `dirname $@` -java $<
 
-build/libFtdi.jnilib: src/com/ftdi/usb/ftdi_wrap.c
-	gcc -I. -I/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Headers/ \
-		$< -o $@ -lftdi -dynamiclib -framework JavaVM
+build/$(jnilib): build/src/com/ftdi/usb/FtdiUart.c upstream/libusb/.built
+	gcc -I. -Iupstream/libftdi -Iupstream/libusb \
+		-I$(JAVA_HOME)/include \
+		$< \
+		upstream/libftdi/ftdi.c \
+		upstream/libusb/.libs/libusb.a \
+		$(linkerflags) \
+		-o $@
 
-javafiles := $(shell find src -name \*.java)
-
-ftdi.jar: $(javafiles) build/libFtdi.jnilib
+slipway.jar: build/$(jnilib) $(shell find src build/src -name \*.java) misc/slipway_drone.bst upstream/jhdl-edifparser.jar
 	mkdir -p build
-	javac -d build $(javafiles)
+	$(javac) -d build $(shell find src build/src -name \*.java)
+	cp misc/slipway_drone.bst build/edu/berkeley/slipway/
 	cd build; jar cvf ../$@ .
 
-drone.hex: src/drone.c
-	avr-gcc -mmcu=at94k -O3 $<
-	avr-objcopy -O ihex a.out $@
-
-rcompile:
-	cp src/edu/berkeley/obits/device/atmel/usbdrone.c /afs/megacz.com/goliath/work/tmp/
-	ssh research.cs.berkeley.edu 'cd /afs/megacz.com/goliath/work/tmp; avr-gcc -O3 -mmcu=at94k usbdrone.c; avr-objcopy -O ihex a.out usbdrone.hex'
-	cp /afs/megacz.com/goliath/work/tmp/usbdrone.hex /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
-	fs flush /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
-	echo okay...
-	read
-	rm /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
-	diff -u /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst bitstreams/usbdrone.bst && exit -1; true
-	mv /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst bitstreams/usbdrone.bst
-	make demo
\ No newline at end of file
+
+
+## libusb ##############################################################################
+
+upstream/libusb:
+	mkdir -p `dirname $@`
+	cd upstream; curl http://voxel.dl.sourceforge.net/sourceforge/libusb/libusb-0.1.12.tar.gz | tar -xvzf -
+	cd upstream; mv libusb-0.1.12 libusb
+
+upstream/libusb/.built: upstream/libusb
+	cd upstream/libusb; \
+		./configure && \
+		make
+	touch $@
+
+javac = javac -cp upstream/jhdl-edifparser.jar
+#java = java -Djava.library.path=$(shell pwd)/lib/ -cp lib/RXTXcomm.jar:slipway.jar
+
+
+
+## for rebuilding usbdrone.hex ###########################################################
+
+build/slipway_drone.hex: src/edu/berkeley/slipway/SlipwaySlave.c  upstream/avr-libc/.built
+	upstream/prefix/bin/avr-gcc -O3 -mmcu=at94k $< -o $@.o
+	upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
+
+# this only works on my personal setup [adam]
+#misc/slipway_drone.bst: build/slipway_drone.hex
+#	cp $<    /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+#	fs flush /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+#	echo okay...
+#	read
+#	rm /afs/research.cs.berkeley.edu/user/megacz/slipway/$<
+#	diff -u /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@ && \
+#		exit -1; true
+#	mv /afs/research.cs.berkeley.edu/user/megacz/slipway/$@ $@
+#	touch $@
+
+
+
+## avr-gcc toolchain and libc ################################################################
+
+upstream/binutils:
+	cd upstream; curl http://ftp.gnu.org/pub/pub/pub/gnu/binutils/binutils-2.19.1.tar.bz2 | tar -xvjf -
+	cd upstream; mv binutils-2.19.1 binutils
+
+upstream/binutils/.built: upstream/binutils
+	mkdir -p upstream/prefix
+	cd upstream/binutils; \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin \
+		./configure --prefix=$(shell pwd)/upstream/prefix --target=avr && \
+		make && \
+		make install
+	touch $@
+
+upstream/gcc:
+	cd upstream; curl http://ftp.gnu.org/pub/gnu/gcc/gcc-4.0.3/gcc-core-4.0.3.tar.bz2 | tar -xvjf -
+	cd upstream; mv gcc-4.0.3 gcc
+
+upstream/gcc/.built: upstream/gcc upstream/binutils/.built
+	mkdir -p upstream/prefix
+	mkdir -p upstream/gcc-build
+	cd upstream/gcc-build; \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin \
+		../gcc/configure --prefix=$(shell pwd)/upstream/prefix --target=avr && \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make && \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make install
+	touch $@
+
+upstream/avr-libc:
+	cd upstream; curl http://nongnu.askapache.com/avr-libc/avr-libc-1.4.3.tar.bz2 | tar -xvjf -
+	cd upstream; mv avr-libc-1.4.3 avr-libc
+
+upstream/avr-libc/.built: upstream/avr-libc upstream/gcc/.built
+	cd upstream/avr-libc; \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin \
+		./configure --prefix=$(shell pwd)/upstream/prefix --host=avr && \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make && \
+		PATH=$$PATH:$(shell pwd)/upstream/prefix/bin make install
+	touch $@
+
+
+## edif parser ##########################################################################
+
+upstream/jhdl-edifparser.jar:
+	mkdir -p upstream
+	curl -o $@- http://reliability.ee.byu.edu/edif/jars/release_0.3.0/edif-0.3.0.jar
+	mv $@- $@
+
+## javadoc ##############################################################################
+
+javadoc:
+	rm -rf doc/api
+	mkdir -p doc/api
+	javadoc \
+		-linksource \
+		-windowtitle "abits" \
+		-sourcepath src \
+		-public \
+		-notree \
+		-noindex \
+		-nonavbar \
+		-noqualifier all \
+		-d doc/api \
+		`find src -name \*.java`