Skip to content

Commit b7aaa8d

Browse files
the-snowwhitethe-snowwhite
committed
Update zynq cores to 2019.1 and add ultrascale+ compatibility
Signed-off-by: Michael Brown <producer@holotronic.dk>
1 parent f9a4df7 commit b7aaa8d

File tree

11 files changed

+106
-121
lines changed

11 files changed

+106
-121
lines changed

‎HW/VivadoProjects/microzed/microzed_jd2cb/ip/hm2_ip_wrap_jd2/component.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,9 +1534,6 @@
15341534
<xilinx:canUpgradeFrom>user.org:user:HostMot2_ip_wrap_jd2:1.0</xilinx:canUpgradeFrom>
15351535
</xilinx:upgrades>
15361536
<xilinx:coreCreationDateTime>2016-07-12T12:57:00Z</xilinx:coreCreationDateTime>
1537-
<xilinx:tags>
1538-
<xilinx:tag xilinx:name="machinekit.io:user:HostMot2_ip_wrap_jd2:1.0_ARCHIVE_LOCATION">/home/developer/mksocfpga/HW/VivadoProjects/microzed/microzed_jd2cb/ip/hm2_ip_wrap_jd2</xilinx:tag>
1539-
</xilinx:tags>
15401537
</xilinx:coreExtensions>
15411538
<xilinx:packagingInfo>
15421539
<xilinx:xilinxVersion>2015.4</xilinx:xilinxVersion>

‎HW/VivadoProjects/microzed/microzed_jd2cb/ip/jd2_mad_logic/component.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@
165165
<xilinx:canUpgradeFrom/>
166166
</xilinx:upgrades>
167167
<xilinx:coreCreationDateTime>2016-08-16T21:11:06Z</xilinx:coreCreationDateTime>
168-
<xilinx:tags>
169-
<xilinx:tag xilinx:name="jd2.com:user:jd2_mad_logic:1_ARCHIVE_LOCATION">/home/developer/mksocfpga/HW/VivadoProjects/microzed/microzed_jd2cb/ip/jd2_mad_logic</xilinx:tag>
170-
</xilinx:tags>
171168
</xilinx:coreExtensions>
172169
<xilinx:packagingInfo>
173170
<xilinx:xilinxVersion>2015.4</xilinx:xilinxVersion>

‎HW/VivadoProjects/zturn/zturn_jd2cb/ip/jd2_mad_logic/component.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@
165165
<xilinx:canUpgradeFrom/>
166166
</xilinx:upgrades>
167167
<xilinx:coreCreationDateTime>2016-08-15T03:32:48Z</xilinx:coreCreationDateTime>
168-
<xilinx:tags>
169-
<xilinx:tag xilinx:name="jd2.com:user:jd2_mad_logic:1_ARCHIVE_LOCATION">/home/developer/mksocfpga/HW/VivadoProjects/zturn/zturn_jd2cb/ip/jd2_mad_logic</xilinx:tag>
170-
</xilinx:tags>
171168
</xilinx:coreExtensions>
172169
<xilinx:packagingInfo>
173170
<xilinx:xilinxVersion>2015.4</xilinx:xilinxVersion>

‎HW/zynq-ip/btint_axi_1.0/component.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -831,11 +831,6 @@
831831
<xilinx:vendorURL>http://www.jd2.com</xilinx:vendorURL>
832832
<xilinx:coreRevision>4</xilinx:coreRevision>
833833
<xilinx:coreCreationDateTime>2016-07-06T20:58:46Z</xilinx:coreCreationDateTime>
834-
<xilinx:tags>
835-
<xilinx:tag xilinx:name="user.org:user:btint:1.0_ARCHIVE_LOCATION">/home/developer/btint_ip/btint_1.0</xilinx:tag>
836-
<xilinx:tag xilinx:name="jd2.com:user:btint:1.0_ARCHIVE_LOCATION">/home/developer/btint_ip/btint_1.0</xilinx:tag>
837-
<xilinx:tag xilinx:name="jd2.com:user:btint_axi:1.0_ARCHIVE_LOCATION">/home/developer/mksocfpga/HW/zynq-ip/btint_axi_1.0</xilinx:tag>
838-
</xilinx:tags>
839834
</xilinx:coreExtensions>
840835
<xilinx:packagingInfo>
841836
<xilinx:xilinxVersion>2015.4</xilinx:xilinxVersion>

‎HW/zynq-ip/hm2_axilite/component.xml‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
<spirit:parameters>
243243
<spirit:parameter>
244244
<spirit:name>viewChecksum</spirit:name>
245-
<spirit:value>d835fd14</spirit:value>
245+
<spirit:value>5cfbc0dd</spirit:value>
246246
</spirit:parameter>
247247
</spirit:parameters>
248248
</spirit:view>
@@ -258,7 +258,7 @@
258258
<spirit:parameters>
259259
<spirit:parameter>
260260
<spirit:name>viewChecksum</spirit:name>
261-
<spirit:value>d835fd14</spirit:value>
261+
<spirit:value>5cfbc0dd</spirit:value>
262262
</spirit:parameter>
263263
</spirit:parameters>
264264
</spirit:view>
@@ -371,7 +371,7 @@
371371
</spirit:wire>
372372
</spirit:port>
373373
<spirit:port>
374-
<spirit:name>S_AXI_ACLK</spirit:name>
374+
<spirit:name>S_AXI_aclk</spirit:name>
375375
<spirit:wire>
376376
<spirit:direction>in</spirit:direction>
377377
<spirit:wireTypeDefs>
@@ -384,7 +384,7 @@
384384
</spirit:wire>
385385
</spirit:port>
386386
<spirit:port>
387-
<spirit:name>S_AXI_ARESETN</spirit:name>
387+
<spirit:name>S_AXI_aresetn</spirit:name>
388388
<spirit:wire>
389389
<spirit:direction>in</spirit:direction>
390390
<spirit:wireTypeDefs>
@@ -397,7 +397,7 @@
397397
</spirit:wire>
398398
</spirit:port>
399399
<spirit:port>
400-
<spirit:name>S_AXI_AWADDR</spirit:name>
400+
<spirit:name>S_AXI_awaddr</spirit:name>
401401
<spirit:wire>
402402
<spirit:direction>in</spirit:direction>
403403
<spirit:vector>
@@ -417,7 +417,7 @@
417417
</spirit:wire>
418418
</spirit:port>
419419
<spirit:port>
420-
<spirit:name>S_AXI_AWPROT</spirit:name>
420+
<spirit:name>S_AXI_awprot</spirit:name>
421421
<spirit:wire>
422422
<spirit:direction>in</spirit:direction>
423423
<spirit:vector>
@@ -437,7 +437,7 @@
437437
</spirit:wire>
438438
</spirit:port>
439439
<spirit:port>
440-
<spirit:name>S_AXI_AWVALID</spirit:name>
440+
<spirit:name>S_AXI_awvalid</spirit:name>
441441
<spirit:wire>
442442
<spirit:direction>in</spirit:direction>
443443
<spirit:wireTypeDefs>
@@ -453,7 +453,7 @@
453453
</spirit:wire>
454454
</spirit:port>
455455
<spirit:port>
456-
<spirit:name>S_AXI_AWREADY</spirit:name>
456+
<spirit:name>S_AXI_awready</spirit:name>
457457
<spirit:wire>
458458
<spirit:direction>out</spirit:direction>
459459
<spirit:wireTypeDefs>
@@ -466,7 +466,7 @@
466466
</spirit:wire>
467467
</spirit:port>
468468
<spirit:port>
469-
<spirit:name>S_AXI_WDATA</spirit:name>
469+
<spirit:name>S_AXI_wdata</spirit:name>
470470
<spirit:wire>
471471
<spirit:direction>in</spirit:direction>
472472
<spirit:vector>
@@ -486,7 +486,7 @@
486486
</spirit:wire>
487487
</spirit:port>
488488
<spirit:port>
489-
<spirit:name>S_AXI_WSTRB</spirit:name>
489+
<spirit:name>S_AXI_wstrb</spirit:name>
490490
<spirit:wire>
491491
<spirit:direction>in</spirit:direction>
492492
<spirit:vector>
@@ -503,7 +503,7 @@
503503
</spirit:wire>
504504
</spirit:port>
505505
<spirit:port>
506-
<spirit:name>S_AXI_WVALID</spirit:name>
506+
<spirit:name>S_AXI_wvalid</spirit:name>
507507
<spirit:wire>
508508
<spirit:direction>in</spirit:direction>
509509
<spirit:wireTypeDefs>
@@ -519,7 +519,7 @@
519519
</spirit:wire>
520520
</spirit:port>
521521
<spirit:port>
522-
<spirit:name>S_AXI_WREADY</spirit:name>
522+
<spirit:name>S_AXI_wready</spirit:name>
523523
<spirit:wire>
524524
<spirit:direction>out</spirit:direction>
525525
<spirit:wireTypeDefs>
@@ -532,7 +532,7 @@
532532
</spirit:wire>
533533
</spirit:port>
534534
<spirit:port>
535-
<spirit:name>S_AXI_BRESP</spirit:name>
535+
<spirit:name>S_AXI_bresp</spirit:name>
536536
<spirit:wire>
537537
<spirit:direction>out</spirit:direction>
538538
<spirit:vector>
@@ -549,7 +549,7 @@
549549
</spirit:wire>
550550
</spirit:port>
551551
<spirit:port>
552-
<spirit:name>S_AXI_BVALID</spirit:name>
552+
<spirit:name>S_AXI_bvalid</spirit:name>
553553
<spirit:wire>
554554
<spirit:direction>out</spirit:direction>
555555
<spirit:wireTypeDefs>
@@ -562,7 +562,7 @@
562562
</spirit:wire>
563563
</spirit:port>
564564
<spirit:port>
565-
<spirit:name>S_AXI_BREADY</spirit:name>
565+
<spirit:name>S_AXI_bready</spirit:name>
566566
<spirit:wire>
567567
<spirit:direction>in</spirit:direction>
568568
<spirit:wireTypeDefs>
@@ -578,7 +578,7 @@
578578
</spirit:wire>
579579
</spirit:port>
580580
<spirit:port>
581-
<spirit:name>S_AXI_ARADDR</spirit:name>
581+
<spirit:name>S_AXI_araddr</spirit:name>
582582
<spirit:wire>
583583
<spirit:direction>in</spirit:direction>
584584
<spirit:vector>
@@ -598,7 +598,7 @@
598598
</spirit:wire>
599599
</spirit:port>
600600
<spirit:port>
601-
<spirit:name>S_AXI_ARPROT</spirit:name>
601+
<spirit:name>S_AXI_arprot</spirit:name>
602602
<spirit:wire>
603603
<spirit:direction>in</spirit:direction>
604604
<spirit:vector>
@@ -618,7 +618,7 @@
618618
</spirit:wire>
619619
</spirit:port>
620620
<spirit:port>
621-
<spirit:name>S_AXI_ARVALID</spirit:name>
621+
<spirit:name>S_AXI_arvalid</spirit:name>
622622
<spirit:wire>
623623
<spirit:direction>in</spirit:direction>
624624
<spirit:wireTypeDefs>
@@ -634,7 +634,7 @@
634634
</spirit:wire>
635635
</spirit:port>
636636
<spirit:port>
637-
<spirit:name>S_AXI_ARREADY</spirit:name>
637+
<spirit:name>S_AXI_arready</spirit:name>
638638
<spirit:wire>
639639
<spirit:direction>out</spirit:direction>
640640
<spirit:wireTypeDefs>
@@ -647,7 +647,7 @@
647647
</spirit:wire>
648648
</spirit:port>
649649
<spirit:port>
650-
<spirit:name>S_AXI_RDATA</spirit:name>
650+
<spirit:name>S_AXI_rdata</spirit:name>
651651
<spirit:wire>
652652
<spirit:direction>out</spirit:direction>
653653
<spirit:vector>
@@ -664,7 +664,7 @@
664664
</spirit:wire>
665665
</spirit:port>
666666
<spirit:port>
667-
<spirit:name>S_AXI_RRESP</spirit:name>
667+
<spirit:name>S_AXI_rresp</spirit:name>
668668
<spirit:wire>
669669
<spirit:direction>out</spirit:direction>
670670
<spirit:vector>
@@ -681,7 +681,7 @@
681681
</spirit:wire>
682682
</spirit:port>
683683
<spirit:port>
684-
<spirit:name>S_AXI_RVALID</spirit:name>
684+
<spirit:name>S_AXI_rvalid</spirit:name>
685685
<spirit:wire>
686686
<spirit:direction>out</spirit:direction>
687687
<spirit:wireTypeDefs>
@@ -694,7 +694,7 @@
694694
</spirit:wire>
695695
</spirit:port>
696696
<spirit:port>
697-
<spirit:name>S_AXI_RREADY</spirit:name>
697+
<spirit:name>S_AXI_rready</spirit:name>
698698
<spirit:wire>
699699
<spirit:direction>in</spirit:direction>
700700
<spirit:wireTypeDefs>
@@ -736,7 +736,8 @@
736736
<spirit:file>
737737
<spirit:name>src/hm2_axilite_int.vhd</spirit:name>
738738
<spirit:fileType>vhdlSource</spirit:fileType>
739-
<spirit:userFileType>CHECKSUM_d835fd14</spirit:userFileType>
739+
<spirit:userFileType>CHECKSUM_5cfbc0dd</spirit:userFileType>
740+
<spirit:userFileType>USED_IN_ipstatic</spirit:userFileType>
740741
</spirit:file>
741742
</spirit:fileSet>
742743
<spirit:fileSet>
@@ -753,11 +754,15 @@
753754
<spirit:name>src/hm2_axilite_gen32_simreg.vhd</spirit:name>
754755
<spirit:fileType>vhdlSource</spirit:fileType>
755756
<spirit:userFileType>IMPORTED_FILE</spirit:userFileType>
757+
<spirit:userFileType>USED_IN_simulation</spirit:userFileType>
758+
<spirit:userFileType>USED_IN_testbench</spirit:userFileType>
756759
</spirit:file>
757760
<spirit:file>
758761
<spirit:name>src/hm2_axilite_int_tb.vhd</spirit:name>
759762
<spirit:fileType>vhdlSource</spirit:fileType>
760763
<spirit:userFileType>IMPORTED_FILE</spirit:userFileType>
764+
<spirit:userFileType>USED_IN_simulation</spirit:userFileType>
765+
<spirit:userFileType>USED_IN_testbench</spirit:userFileType>
761766
</spirit:file>
762767
</spirit:fileSet>
763768
<spirit:fileSet>
@@ -791,29 +796,28 @@
791796
<xilinx:coreExtensions>
792797
<xilinx:supportedFamilies>
793798
<xilinx:family xilinx:lifeCycle="Production">zynq</xilinx:family>
799+
<xilinx:family xilinx:lifeCycle="Beta">zynquplus</xilinx:family>
794800
</xilinx:supportedFamilies>
795801
<xilinx:taxonomies>
796802
<xilinx:taxonomy>/UserIP</xilinx:taxonomy>
797803
</xilinx:taxonomies>
798804
<xilinx:displayName>hm2_axilite_int_v1_0</xilinx:displayName>
799805
<xilinx:vendorDisplayName>MachineKit</xilinx:vendorDisplayName>
800806
<xilinx:vendorURL>http://www.machinekit.io</xilinx:vendorURL>
801-
<xilinx:coreRevision>6</xilinx:coreRevision>
807+
<xilinx:coreRevision>9</xilinx:coreRevision>
802808
<xilinx:upgrades>
803809
<xilinx:canUpgradeFrom>user.org:user:hm2_axilite_int:1.0</xilinx:canUpgradeFrom>
804810
</xilinx:upgrades>
805-
<xilinx:coreCreationDateTime>2016-04-29T02:53:09Z</xilinx:coreCreationDateTime>
806-
<xilinx:tags>
807-
</xilinx:tags>
811+
<xilinx:coreCreationDateTime>2019-09-09T13:52:32Z</xilinx:coreCreationDateTime>
808812
</xilinx:coreExtensions>
809813
<xilinx:packagingInfo>
810-
<xilinx:xilinxVersion>2015.4</xilinx:xilinxVersion>
811-
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="6981b8db"/>
812-
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="506ef2f7"/>
813-
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="ca07ea16"/>
814-
<xilinx:checksum xilinx:scope="ports" xilinx:value="a3f4f143"/>
815-
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="add4e91a"/>
816-
<xilinx:checksum xilinx:scope="parameters" xilinx:value="41d818d8"/>
814+
<xilinx:xilinxVersion>2019.1</xilinx:xilinxVersion>
815+
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="c873e378"/>
816+
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="8518f7a4"/>
817+
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="83641e08"/>
818+
<xilinx:checksum xilinx:scope="ports" xilinx:value="f07e1534"/>
819+
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="401f61ab"/>
820+
<xilinx:checksum xilinx:scope="parameters" xilinx:value="fbe43eed"/>
817821
</xilinx:packagingInfo>
818822
</spirit:vendorExtensions>
819823
</spirit:component>

‎HW/zynq-ip/hm2_axilite/src/hm2_axilite_gen32_simreg.vhd‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)