Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
M
MasterFIP - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
MasterFIP - Gateware
Commits
4646c392
Commit
4646c392
authored
Mar 31, 2023
by
Alén Arias Vázquez
😎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first build try without submodules
parent
ae83ef6f
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
14 additions
and
40 deletions
+14
-40
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
.gitmodules
.gitmodules
+0
-18
etherbone-core
ip_cores/etherbone-core
+0
-1
general-cores
ip_cores/general-cores
+0
-1
gn4124-core
ip_cores/gn4124-core
+0
-1
mockturtle
ip_cores/mockturtle
+0
-1
nanofip
ip_cores/nanofip
+0
-1
wr-cores
ip_cores/wr-cores
+0
-1
masterfip_wbgen2_pkg.vhd
rtl/masterfip_wbgen2_pkg.vhd
+0
-5
Makefile
syn/spec/Makefile
+13
-8
spec_masterfip_mt.vhd
top/spec/spec_masterfip_mt.vhd
+0
-2
No files found.
.gitlab-ci.yml
View file @
4646c392
...
...
@@ -34,7 +34,7 @@ stages:
tags
:
-
vivado-template
script
:
-
cd syn/${PROJECT_NAME}/ && make
setup_lib LIB_DIR=test_ci
-
cd syn/${PROJECT_NAME}/ && make
build
artifacts
:
when
:
on_success
paths
:
...
...
.gitmodules
deleted
100644 → 0
View file @
ae83ef6f
[submodule "ip_cores/general-cores"]
path = ip_cores/general-cores
url = https://ohwr.org/hdl-core-lib/general-cores.git
[submodule "ip_cores/nanofip"]
path = ip_cores/nanofip
url = https://ohwr.org/cern-fip/nanofip/nanofip-gateware.git
[submodule "ip_cores/gn4124-core"]
path = ip_cores/gn4124-core
url = https://ohwr.org/hdl-core-lib/gn4124-core.git
[submodule "ip_cores/wr-cores"]
path = ip_cores/wr-cores
url = https://ohwr.org/hdl-core-lib/wr-cores.git
[submodule "ip_cores/etherbone-core"]
path = ip_cores/etherbone-core
url = https://ohwr.org/hdl-core-lib/etherbone-core.git
[submodule "ip_cores/mockturtle"]
path = ip_cores/mockturtle
url = https://gitlab.cern.ch/coht/mockturtle.git
etherbone-core
@
c1e676dc
Subproject commit c1e676dc9d35028910c50431d70328e522396c89
general-cores
@
1c2dd12b
Subproject commit 1c2dd12b1bceeab3b32b41c3522931c658ad15a7
gn4124-core
@
e3a0bf97
Subproject commit e3a0bf97e125020c83bff6e40199a717e7fda738
mockturtle
@
90f94318
Subproject commit 90f94318cbe6157e3e2bb99f76ec529a945ba48a
nanofip
@
e51c789c
Subproject commit e51c789c8d2351b0ff07716e4ae064426337a748
wr-cores
@
d0d4d09d
Subproject commit d0d4d09d5f0355dfc6c078171bc6856e580a7496
rtl/masterfip_wbgen2_pkg.vhd
View file @
4646c392
...
...
@@ -537,13 +537,8 @@ end function;
end
package
body
;
-- Author : auto-generated by wbgen2 from masterfip_csr.wb
<<<<<<<
HEAD
-- Created : 07/17/17 17:07:34
-- Version : 0x00020000
=======
-- Created : 06/30/17 14:35:27
-- Version : 0x00010000
>>>>>>>
cleanup
-- Standard : VHDL'87
---------------------------------------------------------------------------------------
-- THIS FILE WAS GENERATED BY wbgen2 FROM SOURCE FILE masterfip_csr.wb
...
...
syn/spec/Makefile
View file @
4646c392
...
...
@@ -17,6 +17,9 @@ MOCKTURTLE_DIR=${LIB_DIR}/mockturtle
NANOFIP_DIR
=
${
LIB_DIR
}
/nanofip
WR_CORE_DIR
=
${
LIB_DIR
}
/wr-cores
GN4124_CORE_COMMIT
=
e3a0bf97e125020c83bff6e40199a717e7fda738
SETUP_CMD
=
/bin/bash
-c
# ##############################################################################
# CI commands
ifdef
GITLAB_CI
...
...
@@ -49,16 +52,18 @@ endif
# ##############################################################################
setup_lib
:
/bin/bash
-c
'echo "Cloninig submodules in ${LIB_DIR}"'
/bin/bash
-c
${
ETHERNET_CORE_CMD
}
/bin/bash
-c
${
GENERAL_CORES_CMD
}
/bin/bash
-c
${
GN4124_CORE_CMD
}
/bin/bash
-c
${
MOCKTURTLE_CMD
}
/bin/bash
-c
${
NANOFIP_CMD
}
/bin/bash
-c
${
WR_CORE_CMD
}
/bin/bash
-c
'cd ${GN4124_CORE_DIR} && git checkout e3a0bf97e125020c83bff6e40199a717e7fda738'
${
SETUP_CMD
}
'echo "Cloninig submodules in ${LIB_DIR}"'
${
SETUP_CMD
}
${
ETHERNET_CORE_CMD
}
${
SETUP_CMD
}
${
GENERAL_CORES_CMD
}
${
SETUP_CMD
}
${
GN4124_CORE_CMD
}
${
SETUP_CMD
}
${
MOCKTURTLE_CMD
}
${
SETUP_CMD
}
${
NANOFIP_CMD
}
${
SETUP_CMD
}
${
WR_CORE_CMD
}
${
SETUP_CMD
}
'echo "Checkout commit ${GN4124_CORE_COMMIT} in ${GN4124_CORE_DIR}"'
${
SETUP_CMD
}
'cd ${GN4124_CORE_DIR} && git checkout ${GN4124_CORE_COMMIT}'
build
:
setup_lib
${
SETUP_CMD
}
'echo "Building project"'
xtclsh build.tcl
check_build
:
...
...
top/spec/spec_masterfip_mt.vhd
View file @
4646c392
...
...
@@ -361,8 +361,6 @@ begin
adc_m5v_shdn_n_o
<=
'0'
;
-- OFF
adc_5v_en_n_o
<=
'1'
;
-- OFF
---------------------------------------------------------------------------------------------------
-- MOCK TURTLE CORE --
---------------------------------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment