From 3231d64286d5f4a6f56778863eac764e669c8c38 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 27 Jul 2018 12:25:45 +0100 Subject: [PATCH] resolve nameclash --- src/bsv/Makefile.template | 2 +- src/bsv/bsv_lib/soc_template.bsv | 2 +- src/bsv/pinmux_generator.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bsv/Makefile.template b/src/bsv/Makefile.template index 5c9876f..7d7f821 100644 --- 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 368dfc6..62febf8 100644 --- 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 8d69538..12fdecc 100644 --- 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) -- 2.30.2