diff --git a/+adi/Version.m b/+adi/Version.m
index 2025e343..e84668c2 100644
--- a/+adi/Version.m
+++ b/+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';
diff --git a/CI/gen_doc/docs/_pages/targeting.md b/CI/gen_doc/docs/_pages/targeting.md
index 231ca355..8e3834ab 100644
--- a/CI/gen_doc/docs/_pages/targeting.md
+++ b/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.
diff --git a/CI/scripts/Makefile b/CI/scripts/Makefile
index 3f263203..38519d88 100644
--- a/CI/scripts/Makefile
+++ b/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)
diff --git a/CI/scripts/build_bsp.sh b/CI/scripts/build_bsp.sh
index e0238f8b..3e25a4a1 100644
--- a/CI/scripts/build_bsp.sh
+++ b/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
diff --git a/CI/scripts/synth_designs.sh b/CI/scripts/synth_designs.sh
index af4fc777..e525f762 100644
--- a/CI/scripts/synth_designs.sh
+++ b/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
diff --git a/Jenkinsfile b/Jenkinsfile
index 67137f5c..226182db 100644
--- a/Jenkinsfile
+++ b/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}"
diff --git a/JenkinsfileCron b/JenkinsfileCron
index 522ef075..d5ffcb67 100644
--- a/JenkinsfileCron
+++ b/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}"
diff --git a/README.md b/README.md
index dde57230..e101a632 100644
--- a/README.md
+++ b/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 | 
|
+| 2022_R2 | R2023b | |
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
diff --git a/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m b/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m
index 0d2a67c8..5a418bde 100644
--- a/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m
+++ b/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'), '+'));