finished RC1 version of WB slave definition; added sub-modules (wishbone-gen, general-cores)

b3e15c8c · Jan Pospisil · 44dc14fe · b3e15c8c · b3e15c8c · b3e15c8c
Commit b3e15c8c authored Jun 28, 2016 by Jan Pospisil
6 changed files
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "hdl/ip_cores/general-cores"]
+	path = hdl/ip_cores/general-cores
+	url = git://ohwr.org/hdl-core-lib/general-cores.git
+[submodule "hdl/ip_cores/wishbone-gen"]
+	path = hdl/ip_cores/wishbone-gen
+	url = git://ohwr.org/hdl-core-lib/wishbone-gen.git
--- a/hdl/ffpg/rtl/Manifest.py
+++ b/hdl/ffpg/rtl/Manifest.py
+files = [
+    "ffpg_csr.vhd",
+    "ffpg_csr_pkg.vhd"]
+    
+modules = { "local" : ["../../ip_cores/wishbone-gen/lib"]}
--- a/hdl/ffpg/wb_gen/Makefile
+++ b/hdl/ffpg/wb_gen/Makefile
+WBGEN2=wbgen2
+RTL=../rtl/
+TEX=../../../doc/manual/
+
+%:
+	$(WBGEN2) -l vhdl -H record -V $(RTL)$@.vhd -p $(RTL)$@_pkg.vhd -f html -D $@.htm -C $@.h $@.wb
+	$(WBGEN2) -f texinfo -D $(TEX)$@.tex $@.wb
\ No newline at end of file
--- a/hdl/ffpg/wb_gen/ffpg_csr.wb
+++ b/hdl/ffpg/wb_gen/ffpg_csr.wb
@@ -298,11 +298,34 @@ peripheral {
    access_dev = READ_ONLY;
  };
  
+  ram {
+    name = "CH1 RES serial stream";
+    prefix = "ch1_res_mem";
+    width = 32;
+    size = 2048;
+    clock = "serial_stream_clk_ik";
+    access_bus = READ_WRITE;
+    access_dev = READ_ONLY;
+  };
  
+  ram {
+    name = "CH2 SET serial stream";
+    prefix = "ch2_set_mem";
+    width = 32;
+    size = 2048;
+    clock = "serial_stream_clk_ik";
+    access_bus = READ_WRITE;
+    access_dev = READ_ONLY;
+  };
  
-  
-  
-  
-  
+  ram {
+    name = "CH2 RES serial stream";
+    prefix = "ch2_res_mem";
+    width = 32;
+    size = 2048;
+    clock = "serial_stream_clk_ik";
+    access_bus = READ_WRITE;
+    access_dev = READ_ONLY;
+  };

 };
--- a/general-cores @ bd7bca1c
+++ b/general-cores @ bd7bca1c
+Subproject commit bd7bca1cfb18346c2f4d42f7b5d94a79d7657117
--- a/wishbone-gen @ 8d431e7f
+++ b/wishbone-gen @ 8d431e7f
+Subproject commit 8d431e7f4dbd9e2423b3207267c7495df64e27b0