remove build fifo, ila and icon

[raggedstone] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index c275a06eed175ba6ad5463da6fd24862609b73c4..534fe6d0240150e9eca4af3681f2fb7ab6e0a561 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -3,11 +3,19 @@ PWD := $(shell pwd)
 #auto|lpt1|lpt2|lpt3|com1|com2|com3|com4|usb0|usb1|usb2|usb21|ttya|ttyb|tty00|tty01
 CABLE ?= auto
 
+#DRIVER = /home/michael/Raggedstone/usb-driver/libusb-driver.so
+
 INTSTYLE := silent
 
 SOURCES = $(wildcard sources/*.v source/*.vhd)
+PART ?= xc3s1500-fg456-4
+TARGET ?= bit
+
+ifdef DRIVER
+PRELOAD = LD_PRELOAD=$(DRIVER)
+endif
 
-all: $(PROJECT).bit final
+all: $(PROJECT).$(TARGET) final
 
 log:
        time make all &>build.log
@@ -16,17 +24,17 @@ xst: $(PROJECT).ngc
 
 ngdbuild: $(PROJECT).ngd
 
-$(PROJECT).ngc: $(SOURCES)
+$(PROJECT).ngc: $(SOURCES) $(PROJECT).prj $(PROJECT).ucf $(PROJECT).xst
        @# echo synclib > $(PROJECT).lso # hmm. things are different in ise 9.1
        echo work > $(PROJECT).lso
        xst -intstyle $(INTSTYLE) -ifn $(PROJECT).xst -ofn $(PROJECT).syr
        @#cat $(PROJECT).syr
 
 $(PROJECT).ngd: $(PROJECT).ngc
-       ngdbuild -intstyle $(INTSTYLE) -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p xc3s1500-fg456-4 $(PROJECT).ngc $(PROJECT).ngd
+       ngdbuild -intstyle $(INTSTYLE) -dd "$(PWD)/_ngo" -nt timestamp -uc $(PROJECT).ucf  -p $(PART) $(PROJECT).ngc $(PROJECT).ngd
 
 $(PROJECT)_map.ngm $(PROJECT).pcf: $(PROJECT).ngd
-       map -intstyle $(INTSTYLE) -p xc3s1500-fg456-4 -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf
+       map -intstyle $(INTSTYLE) -p $(PART) -cm area -pr b -k 4 -c 100 -o $(PROJECT)_map.ncd $(PROJECT).ngd $(PROJECT).pcf
 
 $(PROJECT).ncd: $(PROJECT)_map.ngm $(PROJECT).pcf
        @#par -w -intstyle $(INTSTYLE) -ol std -n 4 -t 1 $(PROJECT)_map.ncd $(PROJECT).dir $(PROJECT).pcf
@@ -42,6 +50,12 @@ $(PROJECT).bit: $(PROJECT).ncd
        @#cat $(PROJECT).drc
        @#cat $(PROJECT).bgn
 
+$(PROJECT).vm6: $(PROJECT).ngd
+       cpldfit -intstyle $(INTSTYLE) -p $(PART) -ofmt vhdl -optimize speed -loc on -slew fast -init low -inputs 54 -pterms 25 -unused float -power std -terminate keeper $(PROJECT).ngd
+
+$(PROJECT).jed: $(PROJECT).vm6
+       hprep6 -intstyle $(INTSTYLE) -s IEEE1149 -n $(PROJECT) -i $(PROJECT)
+
 $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs: $(PROJECT).bit
        promgen -intstyle $(INTSTYLE) -w -p mcs -u 0 $(PROJECT) -o $(PROJECT)-xcf02s $(PROJECT)-xcf04s -x xcf02s xcf04s
 
@@ -55,17 +69,18 @@ burn: $(PROJECT).bit
 
 load: $(PROJECT).bit
        @sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xc3s1500.batch >xc3s1500.batch.tmp
-       impact -batch xc3s1500.batch.tmp
+       $(PRELOAD) impact -batch xc3s1500.batch.tmp
        @rm xc3s1500.batch.tmp
 
 flash: $(PROJECT)-xcf02s.mcs $(PROJECT)-xcf04s.mcs
        @sed -e "s|%CABLE%|$(CABLE)|g" -e "s|%PROJECT%|$(PROJECT)|g" ../common/xcf.batch >xcf.batch.tmp
-       impact -batch xcf.batch.tmp
+       $(PRELOAD) impact -batch xcf.batch.tmp
        @rm xcf.batch.tmp
 
 clean:
-       @rm -rf *.bit *.bgn *.mcs *.prm *.bld *.drc *.mcs *.ncd *.ngc *.ngd \
+       @rm -rf *.bit *.bgn *.mcs *.prm *.bld *.drc *.mcs *.ncd *.ngc *.ngd *.edn \
                *.ngr *.pad *.par *.pcf *.prm *.syr *.twr *.twx *.xpi *.lso *.prm *.mcs _impact* \
+               *.vm6 *.jed *.gyd *.mfd *.pnx *.rpt *.err \
                $(PROJECT)_map.* $(PROJECT)_pad.* \
                _ngo xst  \
                build.log \