Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add canary builds for using HDL main branch #156

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion +adi/Contents.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% Analog Devices, Inc. High Speed Converter Toolbox
% Version 21.1.1 (R2021a)
% Version 21.1.1 (R2022b)
%
% ==== Table of Contents (TOC) ====
%
Expand Down
2 changes: 1 addition & 1 deletion +adi/Version.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
% BSP Version information
properties(Constant)
HDL = 'hdl_2021_r2';
Vivado = '2021.2';
Vivado = '2023.1';
MATLAB = 'R2022b';
Release = '22.2.2';
AppName = 'Analog Devices, Inc. High-Speed Converter Toolbox';
Expand Down
12 changes: 8 additions & 4 deletions CI/gen_doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
# Usage:
# make <target> MLRELEASE=<MATLAB release version ex: R2018b> HDLBRANCH=<HDL git branch ex: hdl_2018_r1>
# make <target> MLRELEASE=<MATLAB release version ex: R2022b> HDLBRANCH=<HDL git branch ex: hdl_2021_r1>
# Example
# make build MLRELEASE=R2018b HDLBRANCH=hdl_2018_r1
# make build MLRELEASE=R2022b HDLBRANCH=hdl_2021_r1

SHELL := /bin/bash

MLFLAGS := -nodisplay -nodesktop -nosplash

ifeq ($(MLRELEASE),)
MLRELEASE := R2021a
MLRELEASE := R2022b
endif

ifeq ($(VIVADORELEASE),)
VIVADORELEASE := 2023.1
endif

ifeq ($(HDLBRANCH),)
HDLBRANCH := hdl_2018_r2
HDLBRANCH := main
endif

ifeq ($(OS),Windows_NT)
Expand Down
4 changes: 2 additions & 2 deletions CI/gen_doc/docs/_pages/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ The base dependencies for the toolbox requires libiio and the libiio MATLAB bind

To leverage HDL-Coder and the reference designs with the toolbox requires the following components:

- Xilinx Vivado 2021.1
- Xilinx SDK 2021.1
- Xilinx Vivado 2023.1
- Xilinx SDK 2023.1
- Simulink
- [HDL-Coder™](https://www.mathworks.com/products/hdl-coder.html)
- [HDL Coder™ Support Package for Xilinx Zynq Platform](https://www.mathworks.com/matlabcentral/fileexchange/40447-hdl-coder-support-package-for-xilinx-zynq-platform)
Expand Down
6 changes: 3 additions & 3 deletions CI/gen_doc/docs/_pages/targeting.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 2023.1. Using other versions are not supported. To build the necessary BOOT.BIN files will require the Xilinx Vitis 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\2023.1\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/2023.1/bin/vivado');
```

Please change the tool path if it is different on your system.
Expand Down
2 changes: 1 addition & 1 deletion CI/gen_doc/requirements_doc.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy
mkdocs<1.5
mkdocs<=1.5.3
mkdocs-material
mkdocs-awesome-pages-plugin
mkdocs-mermaid2-plugin
Expand Down
8 changes: 6 additions & 2 deletions CI/scripts/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Usage:
# make <target> MLRELEASE=<MATLAB release version ex: R2018b> HDLBRANCH=<HDL git branch ex: hdl_2018_r1>
# make <target> MLRELEASE=<MATLAB release version ex: R2022b> HDLBRANCH=<HDL git branch ex: hdl_2021_r2>
# Example
# make build MLRELEASE=R2018b HDLBRANCH=hdl_2018_r1
# make build MLRELEASE=R2022b HDLBRANCH=hdl_2021_r2

SHELL := /bin/bash

Expand All @@ -11,6 +11,10 @@ ifeq ($(MLRELEASE),)
MLRELEASE := R2022b
endif

ifeq ($(VIVADORELEASE),)
VIVADORELEASE := 2022.2
endif

ifeq ($(HDLBRANCH),)
HDLBRANCH := hdl_2021_r2
endif
Expand Down
Loading
Loading