use i_class and add core
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 25 Jul 2018 05:50:51 +0000 (06:50 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Wed, 25 Jul 2018 05:50:51 +0000 (06:50 +0100)
.gitmodules
Makefile
bin/gitmoduleinit.sh [new file with mode: 0644]
bin/gitmoduleupdate.sh
src/core [new submodule]
src/peripherals
src/pinmux

index 9c4476f..3e15cde 100644 (file)
@@ -1,6 +1,11 @@
 [submodule "src/peripherals"]
        path = src/peripherals
-       url = gitolite3@libre-riscv.org:shakti-peripherals.git
+       url = /home/lkcl/src/riscv/shakti-peripherals
+       #url = gitolite3@libre-riscv.org:shakti-peripherals.git
 [submodule "src/pinmux"]
        path = src/pinmux
-       url = gitolite3@libre-riscv.org:pinmux.git
+       url = /home/lkcl/src/riscv/pinmux
+       #url = gitolite3@libre-riscv.org:pinmux.git
+[submodule "src/core"]
+       path = src/core
+       url = /home/lkcl/src/riscv/shakti-core/
index 265399b..65a3937 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 all: spec_to_pinmux pinmux_to_bsv gen_verilog
-       @echo making minitest
+       @echo making i_class
 
 spec_to_pinmux:
        @mkdir -p build
-       @cd src/pinmux/ && python src/pinmux_generator.py -s minitest \
-                                               -o ../../build/minitest
+       @cd src/pinmux/ && python src/pinmux_generator.py -s i_class \
+                                               -o ../../build/i_class
 pinmux_to_bsv:
        @mkdir -p build
        @cd src/pinmux/ && python src/pinmux_generator.py \
-                                               -o ../../build/minitest
+                                               -o ../../build/i_class
 gen_verilog:
-       @echo making minitest verilog
-       @make -C build/minitest/bsv_src gen_verilog
+       @echo making i_class verilog
+       @make -C build/i_class/bsv_src gen_verilog
diff --git a/bin/gitmoduleinit.sh b/bin/gitmoduleinit.sh
new file mode 100644 (file)
index 0000000..d6045fa
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+git submodule add gitolite3@libre-riscv.org:shakti-peripherals.git \
+                        src/peripherals
+git submodule add gitolite3@libre-riscv.org:pinmux.git \
+                        src/pinmux
+git submodule add gitolite3@libre-riscv.org:shakti-core \
+                        src/core
+
+# example how to add locally instead:
+#git submodule add /home/lkcl/src/riscv/shakti-core/ src/core
index d823df7..9e8370c 100755 (executable)
@@ -3,3 +3,4 @@ git submodule init
 git submodule update
 cd src/peripherals && git checkout master && git pull
 cd ../pinmux && git checkout master && git pull
+cd ../core && git checkout master && git pull
diff --git a/src/core b/src/core
new file mode 160000 (submodule)
index 0000000..ed1cf08
--- /dev/null
+++ b/src/core
@@ -0,0 +1 @@
+Subproject commit ed1cf08c9be16cdcabff940b2ddd38617a91bdff
index 7dfbba6..45fc9c7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7dfbba622da759890ef294c6b7f9113476d272de
+Subproject commit 45fc9c713d39c82812169f9b799285f9a5b81a8f
index f548b72..08e251c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f548b72cadf68afa8890cd552f4ac2933120ff90
+Subproject commit 08e251cb85f45f882d1c5a807183dff9946e9968