Skip to content

Commit f261272

Browse files
artvvbartvvb
authored
Merge pull request #58 from Digilent/feature/zmod-support
Pull request for merging feature/zmod-support to hierarchies branch
2 parents 202e194 + e1d6f41 commit f261272

File tree

5 files changed

+77
-60
lines changed

5 files changed

+77
-60
lines changed

‎ip/Zmods/AXI_Zmod_ADC1410/component.xml‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@
568568
<spirit:parameters>
569569
<spirit:parameter>
570570
<spirit:name>viewChecksum</spirit:name>
571-
<spirit:value>c3bf278b</spirit:value>
571+
<spirit:value>c9f9b460</spirit:value>
572572
</spirit:parameter>
573573
</spirit:parameters>
574574
</spirit:view>
@@ -590,7 +590,7 @@
590590
<spirit:parameters>
591591
<spirit:parameter>
592592
<spirit:name>viewChecksum</spirit:name>
593-
<spirit:value>c3bf278b</spirit:value>
593+
<spirit:value>c9f9b460</spirit:value>
594594
</spirit:parameter>
595595
</spirit:parameters>
596596
</spirit:view>
@@ -640,7 +640,7 @@
640640
<spirit:parameters>
641641
<spirit:parameter>
642642
<spirit:name>viewChecksum</spirit:name>
643-
<spirit:value>65fdc6e7</spirit:value>
643+
<spirit:value>d34b96a5</spirit:value>
644644
</spirit:parameter>
645645
</spirit:parameters>
646646
</spirit:view>
@@ -1747,23 +1747,23 @@
17471747
<spirit:vendorExtensions>
17481748
<xilinx:coreExtensions>
17491749
<xilinx:supportedFamilies>
1750+
<xilinx:family xilinx:lifeCycle="Pre-Production">zynq</xilinx:family>
17501751
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7</xilinx:family>
17511752
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7l</xilinx:family>
17521753
<xilinx:family xilinx:lifeCycle="Pre-Production">kintex7</xilinx:family>
17531754
<xilinx:family xilinx:lifeCycle="Pre-Production">kintex7l</xilinx:family>
17541755
<xilinx:family xilinx:lifeCycle="Pre-Production">spartan7</xilinx:family>
17551756
<xilinx:family xilinx:lifeCycle="Pre-Production">aartix7</xilinx:family>
17561757
<xilinx:family xilinx:lifeCycle="Pre-Production">aspartan7</xilinx:family>
1757-
<xilinx:family xilinx:lifeCycle="Pre-Production">azynq</xilinx:family>
17581758
<xilinx:family xilinx:lifeCycle="Pre-Production">zynquplus</xilinx:family>
1759-
<xilinx:family xilinx:lifeCycle="Pre-Production">zynq</xilinx:family>
1759+
<xilinx:family xilinx:lifeCycle="Pre-Production">azynq</xilinx:family>
17601760
</xilinx:supportedFamilies>
17611761
<xilinx:taxonomies>
17621762
<xilinx:taxonomy>AXI_Peripheral</xilinx:taxonomy>
17631763
</xilinx:taxonomies>
17641764
<xilinx:displayName>AXI_ZmodADC1410_v1.0</xilinx:displayName>
1765-
<xilinx:coreRevision>141</xilinx:coreRevision>
1766-
<xilinx:coreCreationDateTime>2020-03-05T20:29:46Z</xilinx:coreCreationDateTime>
1765+
<xilinx:coreRevision>143</xilinx:coreRevision>
1766+
<xilinx:coreCreationDateTime>2021-11-11T00:37:39Z</xilinx:coreCreationDateTime>
17671767
<xilinx:tags>
17681768
<xilinx:tag xilinx:name="natinst.com:user:AXI_ZmodADC1410:1.0_ARCHIVE_LOCATION">c:/Vivado_Projects/Deploy/repo/local/ip/AXI_Zmod_ADC1410</xilinx:tag>
17691769
<xilinx:tag xilinx:name="ui.data.coregen.dd@4f2d92da_ARCHIVE_LOCATION">c:/Vivado_Projects/Git_ZmodADC1410_Demo/repo/local/ip/AXI_Zmod_ADC1410</xilinx:tag>
@@ -4063,13 +4063,43 @@
40634063
<xilinx:tag xilinx:name="ui.data.coregen.dd@55eeeac7_ARCHIVE_LOCATION">d:/Github/USB104A7-ZmodDAC/FPGA/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
40644064
<xilinx:tag xilinx:name="ui.data.coregen.dd@6301a865_ARCHIVE_LOCATION">d:/Github/USB104A7-ZmodDAC/FPGA/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
40654065
<xilinx:tag xilinx:name="ui.data.coregen.dd@610218af_ARCHIVE_LOCATION">d:/Github/USB104A7-ZmodDAC/FPGA/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4066+
<xilinx:tag xilinx:name="ui.data.coregen.dd@6fd0b789_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4067+
<xilinx:tag xilinx:name="ui.data.coregen.dd@4630a9_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4068+
<xilinx:tag xilinx:name="ui.data.coregen.dd@177d80ba_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4069+
<xilinx:tag xilinx:name="ui.data.coregen.dd@6adb81e5_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4070+
<xilinx:tag xilinx:name="ui.data.coregen.dd@5f00bd1f_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4071+
<xilinx:tag xilinx:name="ui.data.coregen.dd@6007e28c_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4072+
<xilinx:tag xilinx:name="ui.data.coregen.dd@5d6491ca_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4073+
<xilinx:tag xilinx:name="ui.data.coregen.dd@719d6b19_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4074+
<xilinx:tag xilinx:name="ui.data.coregen.dd@6fed0589_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4075+
<xilinx:tag xilinx:name="ui.data.coregen.dd@52396291_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4076+
<xilinx:tag xilinx:name="ui.data.coregen.dd@49d79e94_ARCHIVE_LOCATION">d:/Workspace/Vivado/ecl/Eclypse-Z7/hw/repo/vivado-library/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4077+
<xilinx:tag xilinx:name="ui.data.coregen.dd@3d5e4f55_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4078+
<xilinx:tag xilinx:name="ui.data.coregen.dd@23b3a573_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4079+
<xilinx:tag xilinx:name="ui.data.coregen.dd@180cb1de_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4080+
<xilinx:tag xilinx:name="ui.data.coregen.dd@79b16ee2_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4081+
<xilinx:tag xilinx:name="ui.data.coregen.dd@47dac470_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4082+
<xilinx:tag xilinx:name="ui.data.coregen.dd@330b3318_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4083+
<xilinx:tag xilinx:name="ui.data.coregen.dd@51c9cf2a_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4084+
<xilinx:tag xilinx:name="ui.data.coregen.dd@bece279_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4085+
<xilinx:tag xilinx:name="ui.data.coregen.dd@47a5f58f_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4086+
<xilinx:tag xilinx:name="ui.data.coregen.dd@48014f35_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4087+
<xilinx:tag xilinx:name="ui.data.coregen.dd@1f3b82f8_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4088+
<xilinx:tag xilinx:name="ui.data.coregen.dd@1bd0d7da_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4089+
<xilinx:tag xilinx:name="ui.data.coregen.dd@73b5e85d_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4090+
<xilinx:tag xilinx:name="ui.data.coregen.dd@48f93c53_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4091+
<xilinx:tag xilinx:name="ui.data.coregen.dd@5749ce45_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4092+
<xilinx:tag xilinx:name="ui.data.coregen.dd@1797f5bd_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4093+
<xilinx:tag xilinx:name="ui.data.coregen.dd@597a2765_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4094+
<xilinx:tag xilinx:name="ui.data.coregen.dd@20b70b9f_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
4095+
<xilinx:tag xilinx:name="ui.data.coregen.dd@78cd0b20_ARCHIVE_LOCATION">d:/Github/vivado-library-zmod-support/ip/Zmods/AXI_Zmod_ADC1410</xilinx:tag>
40664096
</xilinx:tags>
40674097
</xilinx:coreExtensions>
40684098
<xilinx:packagingInfo>
40694099
<xilinx:xilinxVersion>2019.1</xilinx:xilinxVersion>
40704100
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="50c75eb0"/>
40714101
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="ed1368d5"/>
4072-
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="ba783fc5"/>
4102+
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="5cd200d6"/>
40734103
<xilinx:checksum xilinx:scope="ports" xilinx:value="cc209e5f"/>
40744104
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="21100d2f"/>
40754105
<xilinx:checksum xilinx:scope="parameters" xilinx:value="2f8dab14"/>

‎ip/Zmods/AXI_Zmod_ADC1410/src/AXI_ZmodADC1410_v1_0_S00_AXI.vhd‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,7 @@ ProcSlvReg0: process (AxiLiteClk) --Control Register
343343
lSlvReg0(4) <= not lSetStop;
344344
elsif (lSlvRegWrEn = '1' and loc_addr = "00000") then
345345
if (lAxiWstrb(0) = '1') then
346-
lSlvReg0(7 downto 5) <= lAxiWdata(7 downto 5);
347-
lSlvReg0(3 downto 0) <= lAxiWdata(3 downto 0);
348-
if (lAxiWdata(4) = '1') then
349-
lSlvReg0(4) <= lAxiWdata(4);
350-
end if;
346+
lSlvReg0(7 downto 0) <= lAxiWdata(7 downto 0);
351347
end if;
352348
if (lAxiWstrb(1) = '1') then
353349
lSlvReg0(15 downto 8) <= lAxiWdata(15 downto 8);

0 commit comments

Comments
 (0)