resolve nameclash

diff --git a/src/bsv/Makefile.template b/src/bsv/Makefile.template
index 5c9876f49d080f88300a155f4f3bfb32d5fb7dfc..7d7f8215bcf340b75fd64f454da92d0d1e475243 100644 (file)
--- a/src/bsv/Makefile.template
+++ b/src/bsv/Makefile.template
@@ -1,7 +1,7 @@
 ### Makefile for the cclass project
 
 TOP_MODULE:=mkSoc
-TOP_FILE:=soc.bsv
+TOP_FILE:=socgen.bsv
 TOP_DIR:=./
 WORKING_DIR := $(shell pwd)
 

diff --git a/src/bsv/bsv_lib/soc_template.bsv b/src/bsv/bsv_lib/soc_template.bsv
index 368dfc629af8fdfd189bd54ebdea375a7c25ab4d..62febf8666229adbf366de70570148b4ec3ad80a 100644 (file)
--- a/src/bsv/bsv_lib/soc_template.bsv
+++ b/src/bsv/bsv_lib/soc_template.bsv
@@ -28,7 +28,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -------------------------------------------------------------------
 */
-package soc;
+package socgen;
     /*====== Package imports === */
     import FIFO::*;
     import FIFOF::*;

diff --git a/src/bsv/pinmux_generator.py b/src/bsv/pinmux_generator.py
index 8d6953829e3f21bef66ca02564106239d1104926..12fdecc35b4856064cf914865a3f20f04f0b9e34 100644 (file)
--- a/src/bsv/pinmux_generator.py
+++ b/src/bsv/pinmux_generator.py
@@ -86,7 +86,7 @@ def pinmuxgen(pth=None, verify=True):
     idef = os.path.join(bp, 'instance_defines.bsv')
     slow = os.path.join(bp, 'slow_peripherals.bsv')
     slowt = os.path.join(cwd, 'slow_peripherals_template.bsv')
-    soc = os.path.join(bp, 'soc.bsv')
+    soc = os.path.join(bp, 'socgen.bsv')
     soct = os.path.join(cwd, 'soc_template.bsv')
 
     write_pmp(pmp, p, ifaces, iocells)