Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MUonE Processor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cms-tracker-phase2-backend-systems
Back End Firmware
MUonE Processor
Merge requests
!46
Update to new DTC version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Update to new DTC version
dmonk-master-patch-5bd8
into
master
Overview
0
Commits
6
Pipelines
6
Changes
1
Merged
David Gabriel Monk
requested to merge
dmonk-master-patch-5bd8
into
master
11 months ago
Overview
0
Commits
6
Pipelines
6
Changes
1
Expand
0
0
Merge request reports
Compare
master
version 2
272eb4ef
11 months ago
version 1
50b1bfde
11 months ago
master (base)
and
latest version
latest version
f53fce05
6 commits,
11 months ago
version 2
272eb4ef
5 commits,
11 months ago
version 1
50b1bfde
4 commits,
11 months ago
1 file
+
26
−
26
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
replacements/emp-fwk/components/top/firmware/hdl/emp_top_pcie_both_ttc.vhd
+
26
−
26
Options
@@ -128,11 +128,11 @@ begin
-- Infrastructure
pcie_rst_invert
:
if
emp_slim_top_decl
.
PCIE_RST_ACTIVE_LEVEL
=
'1'
generate
pcie_sys_rst_n
<=
not
pcie_sys_rst
;
else
generate
-- pcie_rst_invert
pcie_sys_rst_n
<=
pcie_sys_rst
;
end
generate
pcie_rst_invert
;
pcie_rst_invert
:
if
emp_slim_top_decl
.
PCIE_RST_ACTIVE_LEVEL
=
'1'
generate
pcie_sys_rst_n
<=
not
pcie_sys_rst
;
else
generate
-- pcie_rst_invert
pcie_sys_rst_n
<=
pcie_sys_rst
;
end
generate
pcie_rst_invert
;
infra
:
entity
work
.
emp_infra_pcie
port
map
(
@@ -274,7 +274,7 @@ end generate pcie_rst_invert;
rst
=>
ipb_rst
,
ipb_in
=>
ipb_w_array
(
N_SLV_PAYLOAD
),
ipb_out
=>
ipb_r_array
(
N_SLV_PAYLOAD
),
clk40
=>
clk40
,
clk40
=>
clk40
,
clk_payload
=>
clks_aux
,
rst_payload
=>
rsts_aux
,
clk_p
=>
clk_p
,
@@ -292,33 +292,33 @@ end generate pcie_rst_invert;
-- 10g
gbe_q
=>
gbe_ldata
,
gbe_backpressure
=>
gbe_backpressure
);
);
slink_check
:
if
slink_quads_enabled
(
SLINK_CONF
)
>
0
generate
slink
:
entity
work
.
emp_slink_interface
generic
map
(
throughput
=>
SLINK_THROUGHPUT
,
technology
=>
SLINK_XCVR_TYPE
,
ref_clock_freq
=>
SLINK_REFCLK_FREQ
,
ref_clock_index
=>
IO_REGION_SPEC
(
SLINK_CONF
(
0
)
.
region
)
.
io_async_refclk
slink_check
:
if
slink_quads_enabled
(
SLINK_CONF
)
>
0
generate
slink
:
entity
work
.
emp_slink_interface
generic
map
(
throughput
=>
SLINK_THROUGHPUT
,
technology
=>
SLINK_XCVR_TYPE
,
ref_clock_freq
=>
SLINK_REFCLK_FREQ
,
ref_clock_index
=>
IO_REGION_SPEC
(
SLINK_CONF
(
0
)
.
region
)
.
io_async_refclk
)
port
map
(
ipb_clk
=>
ipb_clk
,
ipb_rst
=>
ipb_rst
,
ipb_in
=>
ipb_w_array
(
N_SLV_SLINK
),
ipb_out
=>
ipb_r_array
(
N_SLV_SLINK
),
port
map
(
ipb_clk
=>
ipb_clk
,
ipb_rst
=>
ipb_rst
,
ipb_in
=>
ipb_w_array
(
N_SLV_SLINK
),
ipb_out
=>
ipb_r_array
(
N_SLV_SLINK
),
clk_40
=>
clk40ish
,
clk_p
=>
clk_p
,
clk_40
=>
clk40ish
,
clk_p
=>
clk_p
,
slink_d
=>
slink_payload_data
,
backpressure
=>
slink_backpressure
,
slink_d
=>
slink_payload_data
,
backpressure
=>
slink_backpressure
,
refclkp
=>
refclkp
,
refclkn
=>
refclkn
refclkp
=>
refclkp
,
refclkn
=>
refclkn
);
end
generate
;
--
-- 10g
Loading