Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HDL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
RTSD
HDL
Commits
47e9a8c1
Commit
47e9a8c1
authored
1 year ago
by
Reinier van der Walle
Browse files
Options
Downloads
Patches
Plain Diff
processed review comments
parent
01da47df
No related branches found
No related tags found
1 merge request
!319
Resolve HPR-87
Pipeline
#46802
passed
1 year ago
Stage: simulation
Stage: synthesis
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd
+11
-8
11 additions, 8 deletions
libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd
libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd
+0
-2
0 additions, 2 deletions
libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd
with
11 additions
and
10 deletions
libraries/base/axi4/src/vhdl/axi4_lite_mm_bridge.vhd
+
11
−
8
View file @
47e9a8c1
...
...
@@ -48,17 +48,19 @@ ENTITY axi4_lite_mm_bridge IS
aresetn
:
OUT
STD_LOGIC
:
=
'1'
;
-- AXI4 active-low reset
mm_rst
:
OUT
STD_LOGIC
:
=
'0'
;
-- MM active-high reset
-- Translate AXI4 lite to MM
axi4_in_copi
:
IN
t_axi4_lite_copi
:
=
c_axi4_lite_copi_rst
;
axi4_in_cipo
:
OUT
t_axi4_lite_cipo
:
=
c_axi4_lite_cipo_rst
;
axi4
_out_copi
:
OUT
t_
axi4_lite_copi
:
=
c_axi4_lite
_copi_rst
;
axi4
_out_cipo
:
IN
t_
axi4_lite_cipo
:
=
c_axi4_lite
_cipo_rst
;
mm
_out_copi
:
OUT
t_
mem_copi
:
=
c_mem
_copi_rst
;
mm
_out_cipo
:
IN
t_
mem_cipo
:
=
c_mem
_cipo_rst
;
mm_in_copi
:
IN
t_mem_copi
:
=
c_mem_copi_rst
;
mm_in_cipo
:
OUT
t_mem_cipo
:
=
c_mem_cipo_rst
;
-- Translate MM to AXI4 lite
mm_in_copi
:
IN
t_mem_copi
:
=
c_mem_copi_rst
;
mm_in_cipo
:
OUT
t_mem_cipo
:
=
c_mem_cipo_rst
;
mm
_out_copi
:
OUT
t_
mem
_copi
:
=
c_
mem
_copi_rst
;
mm
_out_cipo
:
IN
t_
mem
_cipo
:
=
c_
mem
_cipo_rst
axi4
_out_copi
:
OUT
t_
axi4_lite
_copi
:
=
c_
axi4_lite
_copi_rst
;
axi4
_out_cipo
:
IN
t_
axi4_lite
_cipo
:
=
c_
axi4_lite
_cipo_rst
);
END
axi4_lite_mm_bridge
;
...
...
@@ -66,7 +68,7 @@ ARCHITECTURE str OF axi4_lite_mm_bridge IS
-- Sum of all t_mem_copi fields widths (synthesis will optimize away unused address and data bits)
CONSTANT
c_data_w
:
NATURAL
:
=
c_mem_address_w
+
c_mem_data_w
+
2
;
-- 32 + 72 + 1 (wr) + 1 (rd) = 106
SIGNAL
i_rst
:
STD_LOGIC
:
=
'0'
;
-- Internal active high reset.
SIGNAL
i_rst
:
STD_LOGIC
:
=
'0'
;
SIGNAL
axi4_from_mm_copi
:
t_mem_copi
;
SIGNAL
axi4_from_mm_cipo
:
t_mem_cipo
;
...
...
@@ -166,7 +168,8 @@ BEGIN
-- Generate bvalid
q_bvalid
<=
d_bvalid
WHEN
rising_edge
(
in_clk
);
p_bvalid
:
PROCESS
(
i_rst
,
mm_from_axi4_cipo
,
mm_from_axi4_copi
,
axi4_in_copi
)
p_bvalid
:
PROCESS
(
i_rst
,
q_bvalid
,
mm_from_axi4_cipo
,
mm_from_axi4_copi
,
axi4_in_copi
)
BEGIN
d_bvalid
<=
q_bvalid
;
IF
mm_from_axi4_cipo
.
waitrequest
=
'0'
AND
mm_from_axi4_copi
.
wr
=
'1'
THEN
...
...
This diff is collapsed.
Click to expand it.
libraries/base/axi4/src/vhdl/axi4_lite_pkg.vhd
+
0
−
2
View file @
47e9a8c1
...
...
@@ -40,8 +40,6 @@ PACKAGE axi4_lite_pkg IS
------------------------------------------------------------------------------
-- Simple AXI4 lite memory access (for MM control interface)
------------------------------------------------------------------------------
CONSTANT
c_max_string
:
NATURAL
:
=
128
;
CONSTANT
c_axi4_lite_address_w
:
NATURAL
:
=
32
;
CONSTANT
c_axi4_lite_data_w
:
NATURAL
:
=
32
;
CONSTANT
c_axi4_lite_prot_w
:
NATURAL
:
=
3
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment