Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rene Habraken
GRAND_V1
Commits
b76fe430
Commit
b76fe430
authored
Jul 16, 2020
by
Rene Habraken
Browse files
added adc_data_2 and 3 to ad9694 core (and enable signals)
parent
4941640a
Changes
5
Hide whitespace changes
Inline
Side-by-side
library/axi_ad9694/axi_ad9694.v
View file @
b76fe430
...
...
@@ -57,10 +57,16 @@ module axi_ad9694 #(
output
adc_clk
,
output
adc_enable_0
,
output
adc_valid_0
,
output
[
6
3
:
0
]
adc_data_0
,
output
[
3
2
:
0
]
adc_data_0
,
output
adc_enable_1
,
output
adc_valid_1
,
output
[
63
:
0
]
adc_data_1
,
output
[
32
:
0
]
adc_data_1
,
output
adc_enable_2
,
output
adc_valid_2
,
output
[
32
:
0
]
adc_data_2
,
output
adc_enable_3
,
output
adc_valid_3
,
output
[
32
:
0
]
adc_data_3
,
input
adc_dovf
,
// axi interface
...
...
@@ -110,9 +116,9 @@ module axi_ad9694 #(
.
link_data
(
rx_data
),
.
link_ready
(
rx_ready
),
.
enable
(
{
adc_enable_1
,
adc_enable_0
}
),
.
adc_valid
(
{
adc_valid_1
,
adc_valid_0
}
),
.
adc_data
(
{
adc_data_1
,
adc_data_0
}
),
.
enable
(
{
adc_enable_
3
,
adc_enable_2
,
adc_enable_
1
,
adc_enable_0
}
),
.
adc_valid
(
{
adc_valid_
3
,
adc_valid_2
,
adc_valid_
1
,
adc_valid_0
}
),
.
adc_data
(
{
adc_data_
3
,
adc_data_2
,
adc_data_
1
,
adc_data_0
}
),
.
adc_dovf
(
adc_dovf
),
.
s_axi_aclk
(
s_axi_aclk
),
...
...
meta-adi/grand_zcu7/project-spec/configs/config
View file @
b76fe430
...
...
@@ -293,4 +293,6 @@ CONFIG_USER_LAYER_2=""
CONFIG_SUBSYSTEM_BOOTARGS_GENERATED="earlycon console=ttyPS0,115200 clk_ignore_unused root=/dev/nfs nfsroot=192.168.10.1:/srv/nfs,tcp ip=192.168.10.2:192.168.10.1 rw"
meta-adi/grand_zcu7/project-spec/hw-description/system.hdf
View file @
b76fe430
No preview for this file type
meta-adi/grand_zcu7/project-spec/hw-description/system_top.bit
View file @
b76fe430
No preview for this file type
projects/grand/common/grand_bd.tcl
View file @
b76fe430
...
...
@@ -52,9 +52,9 @@ adi_axi_jesd204_rx_create axi_ad9694_jesd 4
ad_ip_instance axi_ad9694 axi_ad9694_core
ad_ip_instance util_cpack2 axi_ad9694_cpack
{
\
NUM_OF_CHANNELS
2
\
NUM_OF_CHANNELS
4
\
SAMPLE_DATA_WIDTH 16
\
SAMPLES_PER_CHANNEL
4
\
SAMPLES_PER_CHANNEL
2
\
}
ad_ip_instance axi_dmac axi_ad9694_dma
...
...
@@ -163,7 +163,7 @@ ad_connect util_grand_xcvr/rx_out_clk_0 axi_ad9694_cpack/clk
ad_connect axi_ad9694_jesd_rstgen/peripheral_reset axi_ad9694_cpack/reset
ad_connect axi_ad9694_core/adc_valid_0 axi_ad9694_cpack/fifo_wr_en
for
{
set i 0
}
{
$i
<
2
}
{
incr i
}
{
for
{
set i 0
}
{
$i
<
4
}
{
incr i
}
{
ad_connect axi_ad9694_core/adc_enable_$i axi_ad9694_cpack/enable_$i
ad_connect axi_ad9694_core/adc_data_$i axi_ad9694_cpack/fifo_wr_data_$i
}
...
...
Write
Preview
Supports
Markdown
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