Fpga next

.gitignore

@@ -0,0 +1,10 @@
+fpga
+install
+ips
+ipstools
+pulp-builder
+pulp-rt-examples
+*mk
+*pyc
+*.f
+*.json

fpga/.gitignore

@@ -1,5 +1,30 @@
-pulpissimo/*
-pulpissimo_genesys2.bin
-pulpissimo_genesys2.bit
-pulpissimo_zcu104.bin
-pulpissimo_zcu104.bit
+pulp_cluster/*.edf
+pulp_cluster/*.v
+pulpemu/pulpemu.*
+ips/*/ip/
+*.jou
+*.log
+*.cache/
+*.hw/
+*.runs/
+*.srcs/
+*.xpr
+*.xci
+*.Xil
+*.mif
+*.swp
+vivado_*
+reports*
+*bin
+*bit
+
+sim/.cxl*
+sim/ips_inputs
+sim/vcompile/rtl/*
+sim/vcompile/ips/*
+sim/models
+sim/modelsim.ini.bak
+*sim.v
+*sdf
+*.mcs
+*.prm

fpga/Makefile

@@ -1,48 +1,48 @@
-.DEFAULT_GOAL:=help
-
-all: genesys2 zcu104 nexys_video ## Generates the bitstream for all supported boards board.
-
-clean_all: clean_genesys2 clean_zcu104 clean_nexys_video ## Removes synthesis output and bitstreams for all boards.
-
-genesys2: ## Generates the bistream for the genesys2 board
-	cd pulpissimo-genesys2; make all
-	cp pulpissimo-genesys2/pulpissimo_genesys2.runs/impl_1/xilinx_pulpissimo.bit pulpissimo_genesys2.bit
-	cp pulpissimo-genesys2/pulpissimo_genesys2.runs/impl_1/xilinx_pulpissimo.bin pulpissimo_genesys2.bin
-	@echo "Bitstream generation for genesys2 board finished. The bitstream Configuration Memory File was copied to ./pulpissimo_genesys2.bit and ./pulpissimo_genesys2.bin"
-
-clean_genesys2: ## Removes all bitstreams, *.log files and vivado related files (rm -rf vivado*) for the genesys2 board.
-	cd pulpissimo-genesys2; make clean
-	rm -f pulpissimo_genesys2.bit
-	rm -f pulpissimo_genesys2.bin
-
-zcu104: ## Generates the bistream for the zcu104 board
-	cd pulpissimo-zcu104; make all
-	cp pulpissimo-zcu104/pulpissimo_zcu104.runs/impl_1/xilinx_pulpissimo.bit pulpissimo_zcu104.bit
-	cp pulpissimo-zcu104/pulpissimo_zcu104.runs/impl_1/xilinx_pulpissimo.bin pulpissimo_zcu104.bin
-	@echo "Bitstream generation for zcu104 board finished. The bitstream Configuration Memory File was copied to ./pulpissimo_zcu104.bit and ./pulpissimo_zcu104.bin"
-
-clean_zcu104: ## Removes all bitstreams, *.log files and vivado related files (rm -rf vivado*) for the zcu104 board.
-	cd pulpissimo-zcu104; make clean
-	rm -f pulpissimo_zcu104.bit
-	rm -f pulpissimo_zcu104.bin
-
-nexys_video: ## Generates the bistream for the nexys_video board
-	cd pulpissimo-nexys_video; make all
-	cp pulpissimo-nexys_video/pulpissimo-nexys_video.runs/impl_1/xilinx_pulpissimo.bit pulpissimo_nexys_video.bit
-	cp pulpissimo-nexys_video/pulpissimo-nexys_video.runs/impl_1/xilinx_pulpissimo.bin pulpissimo_nexys_video.bin
-	@echo "Bitstream generation for nexys_video board finished. The bitstream Configuration Memory File was copied to ./pulpissimo_nexys_video.bit and ./pulpissimo_nexys_video.bin"
-
-clean_nexys_video: ## Removes all bitstreams, *.log files and vivado related files (rm -rf vivado*) for the nexys_video board.
-	cd pulpissimo-nexys_video; make clean
-	rm -f pulpissimo_nexys_video.bit
-	rm -f pulpissimo_nexys_video.bin
-
-help: ## Show this help message
-	@echo "PULPissimo on FPGA"
-	@echo ""
-	@echo "Call make with one of the supported FPGA boards as arguments to generate the bitstream in the corresponding folder. "
-	@echo "E.g. 'make genesys2' to generate the bitstream for the genesys2 board in pulpissimo-genesy2 subdirectory."
-	@echo "By default make invokes 'vivado'  to start Xilinx Vivado. This behaviour can be overriden by setting the make variable 'VIVADO'"
-	@echo "e.g. make genesys2 VIVADO='vivado-2018.3 vivado' for ETH centos machines."
-	@echo ""
-	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+include fpga-settings.mk
+
+all: synth impl
+
+gui:
+	cd pulpemu; make clean-impl gui
+
+impl:
+	cd pulpemu; make clean-impl impl
+
+ips: mem clk
+
+generate_bitstream: ips synth-pulpcluster synth-pulpemu
+
+mem:
+	cd ips/xilinx_interleaved_ram; make clean all
+	cd ips/xilinx_private_ram; make clean all
+	cd ips/xilinx_rom_bank_2048x32; make clean all
+	cd ips/xilinx_tcdm_bank_1024x32; make clean all
+	cd ips/xilinx_tcdm_bank_2048x32; make clean all
+
+clk: ## Synthesizes the Xilinx Clocking Manager IPs
+	cd ips/xilinx_clk_mngr; make clean all
+	cd ips/xilinx_slow_clk_mngr; make clean all
+
+synth: synth-pulpcluster synth-pulpemu
+
+synth-pulpcluster:
+	cd pulp_cluster; make clean all
+
+synth-pulpemu:
+	cd pulpemu; make clean all
+
+cleanall: clean-ips clean-ulpcluster clean-pulpemu
+
+clean-ulpcluster:
+	cd pulp_cluster; make clean
+
+clean-pulpemu:
+	cd pulpemu; make clean
+
+clean-ips:
+	cd ips/xilinx_interleaved_ram; make clean
+	cd ips/xilinx_private_ram; make clean
+	cd ips/xilinx_rom_bank_2048x32; make clean
+	cd ips/xilinx_tcdm_bank_1024x32; make clean
+	cd ips/xilinx_tcdm_bank_2048x32; make clean
+	cd ips/xilinx_clk_mngr; make clean