From 108aac2b6ed0711b4626302de869ab4e8f687a07 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 25 Jul 2018 06:50:51 +0100 Subject: [PATCH] use i_class and add core --- .gitmodules | 9 +++++++-- Makefile | 12 ++++++------ bin/gitmoduleinit.sh | 10 ++++++++++ bin/gitmoduleupdate.sh | 1 + src/core | 1 + src/peripherals | 2 +- src/pinmux | 2 +- 7 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 bin/gitmoduleinit.sh create mode 160000 src/core diff --git a/.gitmodules b/.gitmodules index 9c4476f..3e15cde 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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/ diff --git a/Makefile b/Makefile index 265399b..65a3937 100644 --- 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 index 0000000..d6045fa --- /dev/null +++ b/bin/gitmoduleinit.sh @@ -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 diff --git a/bin/gitmoduleupdate.sh b/bin/gitmoduleupdate.sh index d823df7..9e8370c 100755 --- a/bin/gitmoduleupdate.sh +++ b/bin/gitmoduleupdate.sh @@ -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 index 0000000..ed1cf08 --- /dev/null +++ b/src/core @@ -0,0 +1 @@ +Subproject commit ed1cf08c9be16cdcabff940b2ddd38617a91bdff diff --git a/src/peripherals b/src/peripherals index 7dfbba6..45fc9c7 160000 --- a/src/peripherals +++ b/src/peripherals @@ -1 +1 @@ -Subproject commit 7dfbba622da759890ef294c6b7f9113476d272de +Subproject commit 45fc9c713d39c82812169f9b799285f9a5b81a8f diff --git a/src/pinmux b/src/pinmux index f548b72..08e251c 160000 --- a/src/pinmux +++ b/src/pinmux @@ -1 +1 @@ -Subproject commit f548b72cadf68afa8890cd552f4ac2933120ff90 +Subproject commit 08e251cb85f45f882d1c5a807183dff9946e9968 -- 2.30.2