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

Update scripts to follow HDL main branch #137

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

StancaPop
Copy link
Collaborator

This update has been tested with the adi_project_xilinx.tcl file from the HDL repo that contains the Matlab related environment variables ADI_MATLAB and ADI_SKIP_SYNTHESIS. This commit can be used along with the master branch from the HDL repo, as it also contains all the updates since the HDL_2021_R1 release has been made.

It has been tested both locally and on Jenkins.

Jenkinsfile_dev Outdated Show resolved Hide resolved
Copy link
Collaborator

@tfcollins tfcollins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to rebase this on master first.

Main question, can we remove CI/scripts/adi_project.tcl and just use what in the HDL repo?

@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch 2 times, most recently from c7c2c08 to 3798893 Compare September 4, 2023 09:27
@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch from 0125c25 to 7f011d1 Compare October 4, 2023 07:38
@StancaPop
Copy link
Collaborator Author

V2: The vivado version has been made parametrizable and set to 2022.2. The duplicate scripts copied from the hdl repo (adi_project_xilinx.tcl, adi_ip.tcl and adi_project.tcl) have been deleted and the scripts that use them have been modified to use the ones from the HDL repo.

The modifications have been tested locally, using both the HWA and the test_synth method and they both passed.

@StancaPop StancaPop requested a review from tfcollins October 4, 2023 07:44
Jenkinsfile Outdated Show resolved Hide resolved
Jenkinsfile_dev Outdated Show resolved Hide resolved
@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch from 529be4c to 5200974 Compare December 6, 2023 08:42
@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch from 4f06480 to 16a8391 Compare January 23, 2024 11:44
@StancaPop StancaPop requested a review from tfcollins January 23, 2024 11:46
@StancaPop StancaPop changed the title Update scripts to follow HDL master branch Update scripts to follow HDL main branch Jan 26, 2024
+adi/Version.m Outdated
@@ -3,7 +3,7 @@
% BSP Version information
properties(Constant)
HDL = 'hdl_2021_r2';
Vivado = '2021.2';
Vivado = '2023.1';
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably need to set this in a more programmatic way. So it just updates to whatever the HDL needs

The following changes have been made:
  Add separate Jenkins file for hdl master branch
  Add VIVADOVERSION parameter
  Remove duplicates of HDL scripts:
    adi_project_xilinx.tcl
    adi_ip.tcl
    adi_project.tcl
  synth_designs.sh: Add root repo path
  Replace "master" with "main" for HDL repo
@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch from 16a8391 to c6fc949 Compare October 14, 2024 08:49
Signed-off-by: Travis F. Collins <travis.collins@analog.com>
@StancaPop StancaPop force-pushed the update_scripts_for_master_hdl branch from c6fc949 to 4954320 Compare October 14, 2024 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants