Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
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
Simple PCIe FMC carrier SPEC
Commits
25a56b99
Commit
25a56b99
authored
Jul 10, 2019
by
Tristan Gingold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change template registers map.
parent
67ba287a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
134 additions
and
69 deletions
+134
-69
spec_golden.ucf
hdl/golden/top/spec_golden.ucf
+0
-1
spec_template.vhd
hdl/template/spec_template.vhd
+9
-5
spec_template_regs.cheby
hdl/template/spec_template_regs.cheby
+38
-13
spec_template_regs.vhd
hdl/template/spec_template_regs.vhd
+87
-50
No files found.
hdl/golden/top/spec_golden.ucf
View file @
25a56b99
...
...
@@ -193,7 +193,6 @@ NET "fmc0_sda_b" IOSTANDARD = "LVCMOS25";
#---------------------------------------------------------------------------------------------
# GN4124
NET "gn_rst_n" TIG;
NET "inst_template/cmp_gn4124_core/rst_*" TIG;
#Created by Constraints Editor (xc6slx45t-fgg484-3) - 2011/01/20
NET "inst_template/cmp_gn4124_core/cmp_clk_in/P_clk" TNM_NET = inst_template/cmp_gn4124_core/cmp_clk_in/P_clk;
#Created by Constraints Editor (xc6slx45t-fgg484-3) - 2011/02/04
...
...
hdl/template/spec_template.vhd
View file @
25a56b99
...
...
@@ -106,6 +106,7 @@
signal
genum_wb_out
:
t_wishbone_master_out
;
signal
genum_wb_in
:
t_wishbone_master_in
;
signal
gennum_status
:
std_logic_vector
(
31
downto
0
);
signal
metadata_addr
:
std_logic_vector
(
5
downto
2
);
signal
metadata_data
:
std_logic_vector
(
31
downto
0
);
...
...
@@ -210,7 +211,7 @@
---------------------------------------------------------
-- Control and status
rst_n_a_i
=>
gn_RST_N
,
status_o
=>
open
,
status_o
=>
gennum_status
,
---------------------------------------------------------
-- P2L Direction
...
...
@@ -265,6 +266,7 @@
---------------------------------------------------------
-- CSR wishbone interface (master pipelined)
csr_clk_i
=>
clk_sys
,
csr_rst_n_i
=>
'1'
,
csr_adr_o
=>
genum_wb_out
.
adr
,
csr_dat_o
=>
genum_wb_out
.
dat
,
csr_sel_o
=>
genum_wb_out
.
sel
,
...
...
@@ -276,7 +278,6 @@
csr_stall_i
=>
genum_wb_in
.
stall
,
csr_err_i
=>
genum_wb_in
.
err
,
csr_rty_i
=>
genum_wb_in
.
rty
,
csr_int_i
=>
'0'
,
-- Not used
---------------------------------------------------------
-- L2P DMA Interface (Pipelined Wishbone master)
...
...
@@ -285,8 +286,7 @@
dma_ack_i
=>
'1'
,
dma_stall_i
=>
'0'
,
dma_err_i
=>
'0'
,
dma_rty_i
=>
'0'
,
dma_int_i
=>
'0'
);
dma_rty_i
=>
'0'
);
i_devs
:
entity
work
.
spec_template_regs
port
map
(
...
...
@@ -310,13 +310,17 @@
metadata_data_o
=>
open
,
-- offset to the application metadata
app_offset_i
=>
x"0000_0000"
,
csr_app_offset_i
=>
x"0000_0000"
,
csr_resets_global_o
=>
csr_rst_gbl
,
csr_resets_appl_o
=>
csr_rst_app
,
-- presence lines for the fmcs
csr_fmc_presence_i
=>
fmc_presence
,
csr_gn4124_status_i
=>
gennum_status
,
csr_ddr_status_calib_done_i
=>
'0'
,
csr_pcb_rev_rev_i
=>
x"0"
,
-- Thermometer and unique id
therm_id_i
=>
therm_id_in
,
therm_id_o
=>
therm_id_out
,
...
...
hdl/template/spec_template_regs.cheby
View file @
25a56b99
...
...
@@ -8,23 +8,16 @@ memory-map:
description: a ROM containing the carrier metadata
size: 0x40
interface: sram
- reg:
address: 0x40
name: app_offset
description: offset to the application metadata
access: ro
width: 32
- submap:
name: therm_id
description: Thermometer and unique id
size: 0x10
interface: wb-32-be
x-hdl:
busgroup: True
- block:
name: csr
description: carrier and fmc status and control
address: 0x40
children:
- reg:
name: app_offset
description: offset to the application metadata
access: ro
width: 32
- reg:
name: resets
description: global and application resets
...
...
@@ -42,6 +35,38 @@ memory-map:
description: presence lines for the fmcs
access: ro
width: 32
- reg:
name: gn4124_status
description: status of gennum
access: ro
width: 32
- reg:
name: ddr_status
description: status of the ddr3 controller
access: ro
width: 32
children:
- field:
description: Set when calibration is done.
name: calib_done
range: 0
- reg:
name: pcb_rev
description: pcb revision
access: ro
width: 32
children:
- field:
name: rev
range: 3-0
- submap:
name: therm_id
description: Thermometer and unique id
address: 0x70
size: 0x10
interface: wb-32-be
x-hdl:
busgroup: True
- submap:
name: fmc_i2c
description: i2c controllers to the fmcs
...
...
hdl/template/spec_template_regs.vhd
View file @
25a56b99
This diff is collapsed.
Click to expand it.
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