updated for Vivado 2017.2

added 4th port to ZCU102 HPC0 design
added design for PicoZed 7010 (moved from ethernet-fmc-axi-eth repo)
added set_input_delay constraints for RGMII RX interfaces
added Vivado version check to build scripts
added note in the README file for using older tool versions

README.md

@@ -4,12 +4,25 @@ ethernet-fmc-zynq-gem
 Example design for using the [Quad Gigabit Ethernet FMC](http://ethernetfmc.com "Ethernet FMC") with the Zynq PS hard 
 Gigabit Ethernet MACs (GEM) and the GMII-to-RGMII IP.
 
+## Requirements
+
+This project is designed for Vivado 2017.2. If you are using an older version of Vivado, then you *MUST* use an older version
+of this repository. Refer to the [list of commits](https://github.com/fpgadeveloper/ethernet-fmc-zynq-gem/commits/master "list of commits")
+to find links to the older versions of this repository.
+
+* Vivado 2017.2
+* [Ethernet FMC](http://ethernetfmc.com "Ethernet FMC")
+* One of the above listed Zynq boards
+* For designs containing AXI Ethernet Subsystem IP: [Xilinx Soft TEMAC license](http://ethernetfmc.com/getting-a-license-for-the-xilinx-tri-mode-ethernet-mac/ "Xilinx Soft TEMAC license")
+
 ## Supported boards
 
 * Zynq-7000 [ZedBoard](http://zedboard.org "ZedBoard")
   * LPC connector (use zedboard.xdc)
 * [MicroZed FMC Carrier](http://zedboard.org/product/microzed-fmc-carrier "MicroZed FMC Carrier") with [MicroZed 7Z010 or 7Z020](http://microzed.org "MicroZed")
   * LPC connector (use mzfmc-7z010.xdc or mzfmc-7z020.xdc)
+* Zynq-7000 [PicoZed FMC Carrier Card V2](http://zedboard.org/product/picozed-fmc-carrier-card-v2 "PicoZed FMC Carrier Card V2") with [PicoZed 7010](http://picozed.org "PicoZed")
+  * LPC connector (use pzfmc-7z010.xdc)
 * Zynq UltraScale+ [ZCU102 Evaluation board Rev 1.0](http://www.xilinx.com/products/silicon-devices/soc/zynq-ultrascale-mpsoc.html "ZCU102 Evaluation board Rev 1.0")
   * HPC0 connector (use zcu102-hpc0.xdc)
   * HPC1 connector (use zcu102-hpc1.xdc)
@@ -22,13 +35,6 @@ PHYs. All designs use the hard GEMs but some also use AXI Ethernet Subsystem IP.
 
 ![Ethernet FMC Quad Gig AXI Ethernet](http://ethernetfmc.com/wp-content/uploads/2014/10/qgige_gmii_to_rgmii.png "Zynq Quad Gig Ethernet All AXI Ethernet")
 
-## Requirements
-
-* Vivado 2017.1
-* [Ethernet FMC](http://ethernetfmc.com "Ethernet FMC")
-* One of the above listed Zynq boards
-* For designs containing AXI Ethernet Subsystem IP: [Xilinx Soft TEMAC license](http://ethernetfmc.com/getting-a-license-for-the-xilinx-tri-mode-ethernet-mac/ "Xilinx Soft TEMAC license")
-
 ## Build instructions
 
 To use the sources in this repository, please follow these steps:
@@ -66,14 +72,21 @@ local SDK repository to the SDK workspace. See the readme in the SDK directory f
 
 * This design supports the ZCU102 Rev 1.0 board. Use a commit before 2016-02-13 for the older Rev-D board design.
 Note that the FMC pinouts differ between Rev 1.0 and Rev D: https://www.xilinx.com/support/answers/68050.html
-* This design uses 3x GEMs to connect to ports 0-2 of the Ethernet FMC. The 4th port is left unconnected.
+* The HPC0 design uses 4x GEMs to connect to ports 0-3 of the Ethernet FMC.
+* The HPC1 design uses 3x GEMs to connect to ports 0-2 of the Ethernet FMC. The 4th port is left unconnected
+because certain pins required by the Ethernet FMC (namely LA30, LA31 and LA32) are left unconnected 
+on the HPC1 connector of the ZCU102 board.
 
-### ZedBoard and MicroZed
+### ZedBoard, PicoZed and MicroZed
 
 When changing `ETH_FMC_PORT` from 0-2 to 3 (ie. when switching to GEM1), it has been noticed that
 you have to power cycle the board. When the SDK project is configured for AXI Ethernet, it must make some
 Zynq configurations that are not compatible with the GEM1 configuration.
 
+### PicoZed
+
+* 7Z010: This design uses 3x AXI Ethernet and 1xGMII-to-RGMII connected to GEM1 (GEM0 could be connected to the PicoZed's onboard PHY if desired).
+
 ### MicroZed
 
 #### Uses Zynq Fabric clocks
@@ -87,19 +100,23 @@ yet been able to get around.
 * Using the on-board 125MHz clock into a clock wizard to generate the 200MHz clock is not possible due to the Zynq 7Z010
 only containing two MMCMs.
 
-#### Installation of MicroZed board definition files
+#### Installation of MicroZed and PicoZed board definition files
 
-To use this project, you must first install the board definition files
-for the MicroZed into your Vivado installation.
+To use the projects for the MicroZed and PicoZed, you must first install the board definition files
+for those boards into your Vivado installation.
 
 The following folders contain the board definition files and can be found in this project repository at this location:
 
 https://github.com/fpgadeveloper/ethernet-fmc-zynq-gem/tree/master/Vivado/boards/board_files
 
 * `microzed_7010`
 * `microzed_7020`
+* `picozed_7010_fmc2`
+* `picozed_7015_fmc2`
+* `picozed_7020_fmc2`
+* `picozed_7030_fmc2`
 
-Copy those folders and their contents into the `C:\Xilinx\Vivado\2017.1\data\boards\board_files` folder (this may
+Copy those folders and their contents into the `C:\Xilinx\Vivado\2017.2\data\boards\board_files` folder (this may
 be different on your machine, depending on your Vivado installation directory).
 
 ### Single port limit
@@ -109,7 +126,7 @@ Selection of the Ethernet port can be changed by modifying the defines contained
 `platform_config.h` file in the application sources. Set `PLATFORM_EMAC_BASEADDR`
 to one of the following values depending on the port you want to target, and the hardware platform:
 
-#### ZedBoard and MicroZed designs
+#### ZedBoard, PicoZed and MicroZed designs
 
 * Ethernet FMC Port 0: `XPAR_AXIETHERNET_0_BASEADDR`
 * Ethernet FMC Port 1: `XPAR_AXIETHERNET_1_BASEADDR`
@@ -121,6 +138,7 @@ to one of the following values depending on the port you want to target, and the
 * Ethernet FMC Port 0: `XPAR_XEMACPS_0_BASEADDR`
 * Ethernet FMC Port 1: `XPAR_XEMACPS_1_BASEADDR`
 * Ethernet FMC Port 2: `XPAR_XEMACPS_2_BASEADDR`
+* Ethernet FMC Port 3: `XPAR_XEMACPS_3_BASEADDR` (only valid on HPC0 design)
 
 #### BSP Setting
 
@@ -137,7 +155,7 @@ Check the following if the project fails to build or generate a bitstream:
 Check the version specified in the Requirements section of this readme file. Note that this project is regularly maintained to the latest
 version of Vivado and you may have to refer to an earlier commit of this repo if you are using an older version of Vivado.
 
-### 2. Did you follow the Build instructions in this readme file?
+### 2. Did you correctly follow the Build instructions in this readme file?
 All the projects in the repo are built, synthesised and implemented to a bitstream before being committed, so if you follow the
 instructions, there should not be any build issues.
 
@@ -146,6 +164,11 @@ Vivado doesn't cope well with long directory structures, so copy/clone the repo
 `C:\projects\`. When working in long directory structures, you can get errors relating to missing files, particularly files 
 that are normally generated by Vivado (FIFOs, etc).
 
+## For more information
+
+If you need more information on whether the Ethernet FMC is compatible with your carrier, please contact me [here](http://ethernetfmc.com/contact/ "Ethernet FMC Contact form").
+Just provide me with the pinout of your carrier and I'll be happy to check compatibility and generate a Vivado constraints file for you.
+
 ## License
 
 Feel free to modify the code for your specific application.

SDK/build-sdk.bat

@@ -1,6 +1,6 @@
 @ECHO OFF
 
 setlocal ENABLEDELAYEDEXPANSION
-SET sdk=C:\Xilinx\SDK\2017.1\bin\xsdk.bat
+SET sdk=C:\Xilinx\SDK\2017.2\bin\xsdk.bat
 cmd /c "%sdk% -batch -source build-sdk.tcl"
 pause

Vivado/build-mz-7z010.bat

@@ -1,2 +1,27 @@
-SET vivado=C:\Xilinx\Vivado\2017.1\bin\vivado.bat
-%vivado% -mode batch -source build-mz-7z010.tcl
+SET vivado=C:\Xilinx\Vivado\2017.2\bin\vivado.bat
+@ECHO OFF
+if exist %vivado% (
+  %vivado% -mode batch -source build-mz-7z010.tcl
+) else (
+  ECHO.
+  ECHO ###############################
+  ECHO ### Failed to locate Vivado ###
+  ECHO ###############################
+  ECHO.
+  ECHO This batch file "%~n0.bat" did not find Vivado installed in:
+  ECHO.
+  ECHO     %vivado%
+  ECHO.
+  ECHO Fix the problem by doing one of the following:
+  ECHO.
+  ECHO  1. If you do not have this version of Vivado installed,
+  ECHO     please install it or download the project sources from
+  ECHO     a commit of the Git repository that was intended for
+  ECHO     your version of Vivado.
+  ECHO.
+  ECHO  2. If Vivado is installed in a different location on your
+  ECHO     PC, please modify the first line of this batch file 
+  ECHO     to specify the correct location.
+  ECHO.
+  pause
+)

Vivado/build-mz-7z010.tcl

@@ -3,6 +3,20 @@
 #
 #*****************************************************************************************
 
+# Check the version of Vivado used
+set version_required "2017.2"
+set ver [lindex [split $::env(XILINX_VIVADO) /] 3]
+if {![string equal $ver $version_required]} {
+  puts "###############################"
+  puts "### Failed to build project ###"
+  puts "###############################"
+  puts "This project was designed for use with Vivado $version_required."
+  puts "You are using Vivado $ver. Please install Vivado $version_required,"
+  puts "or download the project sources from a commit of the Git repository"
+  puts "that was intended for your version of Vivado ($ver)."
+  return
+}
+
 set design_name mz_7z010_qgige
 
 # Set the reference directory for source file relative paths (by default the value is script directory path)
@@ -52,6 +66,15 @@ set file [file normalize $file]
 set file_obj [get_files -of_objects [get_filesets constrs_1] [list "*$file"]]
 set_property "file_type" "XDC" $file_obj
 
+# Add/Import constrs file and set constrs file properties
+set file "[file normalize "$origin_dir/src/constraints/rgmii-0123-axieth.xdc"]"
+set file_added [add_files -norecurse -fileset $obj $file]
+set file "$origin_dir/src/constraints/rgmii-0123-axieth.xdc"
+set file [file normalize $file]
+set file_obj [get_files -of_objects [get_filesets constrs_1] [list "*$file"]]
+set_property "file_type" "XDC" $file_obj
+set_property "processing_order" "LATE" $file_obj
+
 # Set 'constrs_1' fileset properties
 set obj [get_filesets constrs_1]
 set_property "target_constrs_file" "$origin_dir/src/constraints/mzfmc-7z010-7z020.xdc" $obj

Vivado/build-mz-7z020.bat

@@ -1,2 +1,27 @@
-SET vivado=C:\Xilinx\Vivado\2017.1\bin\vivado.bat
-%vivado% -mode batch -source build-mz-7z020.tcl
+SET vivado=C:\Xilinx\Vivado\2017.2\bin\vivado.bat
+@ECHO OFF
+if exist %vivado% (
+  %vivado% -mode batch -source build-mz-7z020.tcl
+) else (
+  ECHO.
+  ECHO ###############################
+  ECHO ### Failed to locate Vivado ###
+  ECHO ###############################
+  ECHO.
+  ECHO This batch file "%~n0.bat" did not find Vivado installed in:
+  ECHO.
+  ECHO     %vivado%
+  ECHO.
+  ECHO Fix the problem by doing one of the following:
+  ECHO.
+  ECHO  1. If you do not have this version of Vivado installed,
+  ECHO     please install it or download the project sources from
+  ECHO     a commit of the Git repository that was intended for
+  ECHO     your version of Vivado.
+  ECHO.
+  ECHO  2. If Vivado is installed in a different location on your
+  ECHO     PC, please modify the first line of this batch file 
+  ECHO     to specify the correct location.
+  ECHO.
+  pause
+)

Vivado/build-mz-7z020.tcl

@@ -3,6 +3,20 @@
 #
 #*****************************************************************************************
 
+# Check the version of Vivado used
+set version_required "2017.2"
+set ver [lindex [split $::env(XILINX_VIVADO) /] 3]
+if {![string equal $ver $version_required]} {
+  puts "###############################"
+  puts "### Failed to build project ###"
+  puts "###############################"
+  puts "This project was designed for use with Vivado $version_required."
+  puts "You are using Vivado $ver. Please install Vivado $version_required,"
+  puts "or download the project sources from a commit of the Git repository"
+  puts "that was intended for your version of Vivado ($ver)."
+  return
+}
+
 set design_name mz_7z020_qgige
 
 # Set the reference directory for source file relative paths (by default the value is script directory path)
@@ -52,6 +66,15 @@ set file [file normalize $file]
 set file_obj [get_files -of_objects [get_filesets constrs_1] [list "*$file"]]
 set_property "file_type" "XDC" $file_obj
 
+# Add/Import constrs file and set constrs file properties
+set file "[file normalize "$origin_dir/src/constraints/rgmii-0123-axieth.xdc"]"
+set file_added [add_files -norecurse -fileset $obj $file]
+set file "$origin_dir/src/constraints/rgmii-0123-axieth.xdc"
+set file [file normalize $file]
+set file_obj [get_files -of_objects [get_filesets constrs_1] [list "*$file"]]
+set_property "file_type" "XDC" $file_obj
+set_property "processing_order" "LATE" $file_obj
+
 # Set 'constrs_1' fileset properties
 set obj [get_filesets constrs_1]
 set_property "target_constrs_file" "$origin_dir/src/constraints/mzfmc-7z010-7z020.xdc" $obj

Vivado/build-pz-7z010.bat

@@ -0,0 +1,27 @@
+SET vivado=C:\Xilinx\Vivado\2017.2\bin\vivado.bat
+@ECHO OFF
+if exist %vivado% (
+  %vivado% -mode batch -source build-pz-7z010.tcl
+) else (
+  ECHO.
+  ECHO ###############################
+  ECHO ### Failed to locate Vivado ###
+  ECHO ###############################
+  ECHO.
+  ECHO This batch file "%~n0.bat" did not find Vivado installed in:
+  ECHO.
+  ECHO     %vivado%
+  ECHO.
+  ECHO Fix the problem by doing one of the following:
+  ECHO.
+  ECHO  1. If you do not have this version of Vivado installed,
+  ECHO     please install it or download the project sources from
+  ECHO     a commit of the Git repository that was intended for
+  ECHO     your version of Vivado.
+  ECHO.
+  ECHO  2. If Vivado is installed in a different location on your
+  ECHO     PC, please modify the first line of this batch file 
+  ECHO     to specify the correct location.
+  ECHO.
+  pause
+)