Merge pull request #1240 from antmicro/zynq_ps7

Zynq PS7 support
f4pga · Dec 20, 2019 · 6575fce · 6575fce
2 parents 9a7ac6b + 2f785c9
commit 6575fce
Show file tree

Hide file tree

Showing 24 changed files with 7,958 additions and 19 deletions.
diff --git a/xc7/archs/zynq7/devices/xc7z010-virt/CMakeLists.txt b/xc7/archs/zynq7/devices/xc7z010-virt/CMakeLists.txt
@@ -12,6 +12,7 @@ add_xc7_device_define_type(
     CLK_BUFG_BOT_R
     CMT_TOP_L_UPPER_T
     HCLK_IOI3
+    PSS2
   PB_TYPES
     SLICEL
     SLICEM
@@ -22,4 +23,5 @@ add_xc7_device_define_type(
     BUFGCTRL
     PLLE2_ADV
     HCLK_IOI3
+    PSS2
 )
diff --git a/xc7/archs/zynq7/tiles/CMakeLists.txt b/xc7/archs/zynq7/tiles/CMakeLists.txt
@@ -6,6 +6,7 @@ add_subdirectory(clk_bufg_top_r)
 add_subdirectory(clk_bufg_bot_r)
 add_subdirectory(bufgctrl)
 add_subdirectory(hclk_ioi3)
+add_subdirectory(pss2)
 
 set(IOPAD_SITES IOB33 IDELAYE2 ILOGICE3 OLOGICE3)
 set(IOPAD_S_SITES IOB33S IDELAYE2 ILOGICE3 OLOGICE3)

diff --git a/xc7/archs/zynq7/tiles/pss2/CMakeLists.txt b/xc7/archs/zynq7/tiles/pss2/CMakeLists.txt
@@ -0,0 +1,7 @@
+project_xray_tile(
+  PART zynq7
+  TILE PSS2
+  SITE_TYPES PS7/PS7
+  EQUIVALENT_SITES PSS2
+  NO_FASM_PREFIX
+  )
diff --git a/xc7/fasm2bels/fasm2bels.py b/xc7/fasm2bels/fasm2bels.py
@@ -86,6 +86,7 @@ def null_process(conn, top, tile, tiles):
     'BRAM_R': process_bram,
     'CMT_TOP_R_UPPER_T': process_pll,
     'CMT_TOP_L_UPPER_T': process_pll,
+    'CFG_CENTER_MID': null_process,
 }
 
 

diff --git a/xc7/primitives/CMakeLists.txt b/xc7/primitives/CMakeLists.txt
@@ -17,3 +17,4 @@ add_subdirectory(bufgctrl)
 add_subdirectory(bufhce)
 add_subdirectory(plle2_adv)
 add_subdirectory(idelayctrl)
+add_subdirectory(ps7)
diff --git a/xc7/primitives/ps7/CMakeLists.txt b/xc7/primitives/ps7/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_file_target(FILE ps7.pb_type.xml SCANNER_TYPE xml)
+add_file_target(FILE ps7.model.xml SCANNER_TYPE xml)