X-Git-Url: https://git.libre-soc.org/?p=soc.git;a=blobdiff_plain;f=Makefile;h=185a0d223124d60253041a59d1f53835adc84df3;hp=28b8f38b1f2e7189b4e62b4c514691424e5957d2;hb=HEAD;hpb=b6fdac253479a66f25fbb33f34f07c18ce7d222b

diff --git a/Makefile b/Makefile
index 28b8f38b..15670cf8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,23 +11,26 @@ mkpinmux:
 	cp pinmux/ls180/ls180_pins.py src/soc/debug
 	cp pinmux/ls180/ls180_pins.py src/soc/litex/florent/libresoc
 
-install: develop mkpinmux
+install: gitupdate develop mkpinmux
 
+# this is now actually part of openpower-isa repository
 pywriter:
-	python3 src/soc/decoder/pseudo/pywriter.py
+	echo "pywriter is part of openpower-isa, run that instead"
 
+# this is now actually part of openpower-isa repository
 svanalysis:
-	python3 libreriscv/openpower/sv_analysis.py
+	echo "sv_analysis is part of openpower-isa, run that instead"
 
 develop:
 	python3 setup.py develop # yes, develop, not install
-	python3 src/soc/decoder/pseudo/pywriter.py
 
-run_sim: install
-	python3 src/soc/simple/issuer_verilog.py \
+# build and run libresoc litex simulation
+run_sim:
+	python3 src/soc/simple/issuer_verilog.py --disable-svp64 \
 			src/soc/litex/florent/libresoc/libresoc.v
 	python3 src/soc/litex/florent/sim.py --cpu=libresoc
 
+# and with test gpio (useful for XICS IRC testing)
 testgpio_run_sim:
 	python3 src/soc/simple/issuer_verilog.py \
 			src/soc/litex/florent/libresoc/libresoc.v \
@@ -35,15 +38,76 @@ testgpio_run_sim:
 	python3 src/soc/litex/florent/sim.py --cpu=libresoc \
 			--variant=standardjtagtestgpio
 
+ls180_verilog_nopll:
+	python3 src/soc/simple/issuer_verilog.py \
+	        --debug=jtag --enable-core --disable-pll \
+	        --enable-xics --disable-svp64 \
+			src/soc/litex/florent/libresoc/libresoc.v
+
 ls180_verilog:
 	python3 src/soc/simple/issuer_verilog.py \
 	        --debug=jtag --enable-core --enable-pll \
-	        --enable-xics --enable-sram4x4kblock
+	        --enable-xics --disable-svp64 \
+			src/soc/litex/florent/libresoc/libresoc.v
+
+ls180_4k_verilog:
+	python3 src/soc/simple/issuer_verilog.py \
+	        --debug=jtag --enable-core --enable-pll \
+	        --enable-xics --enable-sram4x4kblock --disable-svp64 \
 			src/soc/litex/florent/libresoc/libresoc.v
 
+# build microwatt "external core", note that the TLB set size is set to 16
+# for I/D-Cache which needs a corresponding alteration of the device-tree
+# entries for linux
+microwatt_external_core:
+	python3 src/soc/simple/issuer_verilog.py --microwatt-compat --enable-mmu \
+            external_core_top.v
+
+# build microwatt "external core" with fixed 64-bit width SVP64
+# note that the TLB set size is set to 16
+# for I/D-Cache which needs a corresponding alteration of the device-tree
+# entries for linux
+microwatt_external_core_svp64:
+	python3 src/soc/simple/issuer_verilog.py --microwatt-compat-svp64 --enable-mmu \
+            external_core_top.v
+
+microwatt_external_core_spi:
+	python3 src/soc/simple/issuer_verilog.py --microwatt-compat \
+            --small-cache \
+            --enable-mmu \
+            --pc-reset 0x10000000 \
+            external_core_top.v
+
+# microwatt-compatible core with smaller cache size (quick. VERSA_ECP5. just)
+microwatt_external_core_bram:
+	python3 src/soc/simple/issuer_verilog.py --microwatt-compat \
+            --small-cache \
+            --enable-mmu \
+            --pc-reset 0xFF000000 \
+            external_core_top.v
+
+# microwatt-compatible core with larger cache size (experiment on arty)
+microwatt_external_core_bram_arty:
+	python3 src/soc/simple/issuer_verilog.py --microwatt-compat \
+            --enable-mmu \
+            --pc-reset 0xFF000000 \
+            external_core_top.v
+
+# build the litex libresoc SoC without 4k SRAMs
+ls180_verilog_build: ls180_verilog
+	make -C soc/soc/litex/florent ls180
+
+# build the litex libresoc SoC with 4k SRAMs
+ls180_4ksram_verilog_build: ls180_4k_verilog
+	make -C soc/soc/litex/florent ls1804k
+
+# testing (usually done at install time)
 test: install
 	python3 setup.py test # could just run nosetest3...
 
+pypiupload:
+	$(PYTHON3) setup.py sdist upload
+
 # Minimal makefile for Sphinx documentation
 #
 
@@ -58,13 +122,16 @@ BUILDDIR      = build
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
+# copies all documentation to libre-soc (libre-soc admins only)
+htmlupload: clean html
+	rsync -HPavz --delete build/html/* \
+        libre-soc.org:/var/www/libre-soc.org/docs/soc/
+
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
+	echo "catch-all falling through to sphinx for document building"
 	mkdir -p "$(SOURCEDIR)"/src/gen
 	sphinx-apidoc --ext-autodoc -o "$(SOURCEDIR)"/src/gen ./src/soc
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-htmlupload: clean html
-	rsync -HPavz --delete build/html/* \
-        libre-soc.org:/var/www/libre-soc.org/docs/soc/