Merge pull request #161 from analogdevicesinc/hdl-2022-r2-support

Author: tfcollins

+adi/Version.m

@@ -2,8 +2,8 @@
     %Version
     %   BSP Version information
     properties(Constant)
-        HDL = 'hdl_2021_r2';
-        Vivado = '2021.2';
+        HDL = 'hdl_2022_r2';
+        Vivado = '2022.2';
         MATLAB = 'R2023b';
         Release = '23.2.1';
         AppName = 'Analog Devices, Inc. High-Speed Converter Toolbox';

CI/gen_doc/docs/_pages/targeting.md

@@ -11,18 +11,18 @@ High-Speed Converter Toolbox supports the IP Core generation flow from MathWorks
 
 ## Getting Started
 
-To perform targeting will require FPGA vendor tools for the FPGA system. For Xilinx this will be Vivado and the toolbox will require specific versions for each release. For the current release this is Vivado 2021.2. Using other versions are not supported. To build the necessary BOOT.BIN files will require the Xilinx SDK as well.
+To perform targeting will require FPGA vendor tools for the FPGA system. For Xilinx this will be Vivado and the toolbox will require specific versions for each release. For the current release this is Vivado 2022.2. Using other versions are not supported. To build the necessary BOOT.BIN files will require the Xilinx SDK as well.
 
 Once you have the installed the necessary 3rd party tools MATLAB needs to be told where they are installed by use of the [hdlsetuptoolpath](https://www.mathworks.com/help/hdlcoder/ref/hdlsetuptoolpath.html) command. For Windows the following MATLAB command can be used:
 
 ```matlab
-hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', 'C:\Xilinx\Vivado\2021.2\bin\vivado.bat');
+hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', 'C:\Xilinx\Vivado\2022.2\bin\vivado.bat');
 ```
 
 or Linux:
 
 ```matlab
-hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', '/opt/Xilinx/Vivado/2021.2/bin/vivado');
+hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', '/opt/Xilinx/Vivado/2022.2/bin/vivado');
 ```
 
 Please change the tool path if it is different on your system.

CI/scripts/Makefile

@@ -12,7 +12,7 @@ MLRELEASE := R2023b
 endif
 
 ifeq ($(HDLBRANCH),)
-HDLBRANCH := hdl_2021_r2
+HDLBRANCH := hdl_2022_r2
 endif
 
 ifeq ($(OS),Windows_NT)

CI/scripts/build_bsp.sh

@@ -2,7 +2,7 @@
 set -x
 
 if [ -z "${HDLBRANCH}" ]; then
-HDLBRANCH='hdl_2021_r2'
+HDLBRANCH='hdl_2022_r2'
 fi
 
 # Script is designed to run from specific location

CI/scripts/synth_designs.sh

@@ -13,11 +13,11 @@ MLPATH=/usr/local/MATLAB
 cd ../.. 
 cp hdl/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m
 sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m
-source /opt/Xilinx/Vivado/2021.2/settings64.sh
+source /opt/Xilinx/Vivado/2022.2/settings64.sh
 Xvfb :77 &
 export DISPLAY=:77
 export SWT_GTK3=0
-source /opt/Xilinx/Vivado/2021.2/settings64.sh
+source /opt/Xilinx/Vivado/2022.2/settings64.sh
 $MLPATH/$MLRELEASE/bin/matlab $MLFLAGS -r "cd('test');runSynthTests('$BOARD');"
 pidof Xvfb
 if [ $? -eq 0 ]; then

Jenkinsfile

@@ -8,7 +8,7 @@ dockerHost = 'docker'
 
 ////////////////////////////
 
-hdlBranches = ['main','hdl_2021_r2']
+hdlBranches = ['main','hdl_2022_r2']
 
 stage("Build Toolbox") {
     dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) { 
@@ -23,14 +23,14 @@ stage("Build Toolbox") {
 		    sh 'make -C ./CI/scripts gen_tlbx'
 		}
         } catch(Exception ex) {
-		if (branchName == 'hdl_2021_r2') {
+		if (branchName == 'hdl_2022_r2') {
 		    error('Production Toolbox Build Failed')
 		}
 		else {
 		    unstable('Development Build Failed')
 		}
         }
-        if (branchName == 'hdl_2021_r2') {
+        if (branchName == 'hdl_2022_r2') {
 	    archiveArtifacts artifacts: '*.mltbx'
             stash includes: '**', name: 'builtSources', useDefaultExcludes: false
         }
@@ -40,7 +40,7 @@ stage("Build Toolbox") {
 /////////////////////////////////////////////////////
 
 boardNames = ['daq2','ad9081','ad9434','ad9739a','ad9265', 'fmcjesdadc1','ad9783']
-dockerConfig.add("-e HDLBRANCH=hdl_2021_r2")
+dockerConfig.add("-e HDLBRANCH=hdl_2022_r2")
 
 cstage("HDL Tests", "", flags) {
     dockerParallelBuild(boardNames, dockerHost, dockerConfig) { 
@@ -69,7 +69,7 @@ def board = 'ad9208';
 def nodeLabel = 'baremetal && high_memory';
 deployments[board] = { node(nodeLabel) {
     cstage("Baremetal HDL Test", "", flags) {
-        withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
+        withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
             try {
                 cstage("AD9208 HDL Test", "", flags) {
                     echo "Node: ${env.NODE_NAME}"

JenkinsfileCron

@@ -6,7 +6,7 @@ dockerHost = 'docker'
 
 ////////////////////////////
 
-hdlBranches = ['hdl_2021_r2']
+hdlBranches = ['hdl_2022_r2']
 
 stage("Build Toolbox") {
     dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) { 
@@ -19,14 +19,14 @@ stage("Build Toolbox") {
 		    sh 'make -C ./CI/scripts gen_tlbx'
 		}
         } catch(Exception ex) {
-		if (branchName == 'hdl_2021_r2') {
+		if (branchName == 'hdl_2022_r2') {
 		    error('Production Toolbox Build Failed')
 		}
 		else {
 		    unstable('Development Build Failed')
 		}
         }
-        if (branchName == 'hdl_2021_r2') {
+        if (branchName == 'hdl_2022_r2') {
             stash includes: '**', name: 'builtSources', useDefaultExcludes: false
         }
     }
@@ -47,7 +47,7 @@ for (int i=0; i < boardNames.size(); i++) {
         nodeLabel = 'baremetal && high_memory';
     deployments[board] = { node(nodeLabel) {
         stage("Synthesis Tests") {
-            withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
+            withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
                 try {
                     stage("Synth") {
                         echo "Node: ${env.NODE_NAME}"

README.md

@@ -12,15 +12,15 @@ As with many open source packages, we use [GitHub](https://github.com/analogdevi
 
 | HDL Branch         | MATLAB Release |  Installer Package  |
 |:------------------:|:--------------:|:-------------------:|
-| 2021_R2            | R2023b         | <a href="http://swdownloads.analog.com/cse/toolboxes/hsx/master/AnalogDevicesHighSpeedConverterToolbox_v23.2.1.mltbx"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
+| 2022_R2            | R2023b         | <a href="http://swdownloads.analog.com/cse/toolboxes/hsx/master/AnalogDevicesHighSpeedConverterToolbox_v23.2.1.mltbx"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
 
 If you use it, and like it - please let us know. If you use it, and hate it - please let us know that too.
 
 ## Supported Tools and Releases
 
 We provide support for certain releases of MATLAB. This does not mean older releases will not work but they are not maintained. Currently supported tools are:
-- Bug fixes: MATLAB R2022b with Vivado 2021.1
-- Bug fixes and new features: MATLAB R2023b with Vivado 2021.2
+- Bug fixes: MATLAB R2023b with Vivado 2021.2
+- Bug fixes and new features: MATLAB R2023b with Vivado 2022.2
 
 ## Support and Documentation
 

hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m

@@ -38,7 +38,7 @@
 
 % Tool information
 %hRD.SupportedToolVersion = {adi.Version.Vivado}; % FIXME
-hRD.SupportedToolVersion = {'2021.2'};
+hRD.SupportedToolVersion = {'2022.2'};
 
 % Get the root directory
 rootDir = fileparts(strtok(mfilename('fullpath'), '+'));