Commit 62ec674c authored by Dimitris Lampridis's avatar Dimitris Lampridis

Merge branch '31-migrate-to-common-ci-and-use-ci-to-build-fpga-bitstreams' into 'master'

Resolve "Migrate to common CI and use CI to build FPGA bitstreams"

Closes #31

See merge request be-cem-edl/fec/hardware-modules/fmc-tdc-1ns-5cha!13
parents 9f03ccce fc64bf72
......@@ -11,7 +11,6 @@ modelsim.ini
*.vstf
work
*.bak
hdl/syn/*
transcript
work/
NullFile
......
......@@ -4,12 +4,15 @@
variables:
GIT_SUBMODULE_STRATEGY: normal
EDL_CI_DOC_SRC_PATH: 'doc'
EDL_CI_DOC_DST_PATH: '$EDL_CI_EOS_OUTPUT_DIR/doc'
include:
- project: 'be-cem-edl/evergreen/gitlab-ci'
ref: master
file:
- 'edl-gitlab-ci.yml'
- local: 'hdl/syn/.gitlab-ci.yml'
cppcheck:
stage: analyse
......@@ -25,18 +28,6 @@ flawfinder:
script:
- make -C software/tools flawfinder
documentation:
stage: build
image:
name: gitlab-registry.cern.ch/coht/common-containers/documentation:latest
script:
- make -C doc html
- mkdir -p $EDL_CI_EOS_OUTPUT_DIR
- cp -a doc/_build/html/* $EDL_CI_EOS_OUTPUT_DIR
artifacts:
paths:
- $EDL_CI_EOS_OUTPUT_DIR
.script_fetch_kernel_dep: &script_fetch_kernel_dep
- git clone -b v1.1.5 --depth 1 https://ohwr.org/project/fmc-sw.git ~/git/fmc
- export FMC=~/git/fmc
......
breathe
docutils
Sphinx
sphinx
sphinx-rtd-theme
sphinx-autodoc-typehints
......@@ -423,7 +423,7 @@ begin
process (clk_tdc_i)
begin
if rising_edge (clk_tdc_i) then
if rst_tdc_i = '1' then
if rst_tdc_n_i = '1' then
ctrl_reg_d <= (others =>'0');
else
ctrl_reg_d <= ctrl_reg;
......
# SPDX-FileCopyrightText: 2022 CERN (home.cern)
#
# SPDX-License-Identifier: LGPL-2.1-or-later
variables:
_FMC_TDC_BITSTREAM_DEST: $CI_PROJECT_DIR/$EDL_CI_EOS_OUTPUT_DIR/bitstreams
.syn_template: &syn_template
interruptible: true
stage: build
needs: []
tags:
- xilinx_ise
- "14.7"
script:
- git submodule init && git submodule update
- cd hdl/syn/"$SYN_NAME"/
- hdlmake
- make
- |
if [[ $(cat *.par | grep -c "All constraints were met") = 0 ]]
then
echo -e "\e[31mTiming errors detected in PAR report. Aborting...\e[0m"
exit 1
fi
- tar -cJf $SYN_NAME.tar.xz *.syr *.par *.twr *.bit *.bin
- mkdir -p $_FMC_TDC_BITSTREAM_DEST
- cp $SYN_NAME.tar.xz $_FMC_TDC_BITSTREAM_DEST
artifacts:
name: "$SYN_NAME-synthesis-$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
paths:
- $_FMC_TDC_BITSTREAM_DEST/*
SPEC synthesis:
variables:
SYN_NAME: "spec"
<<: *syn_template
SVEC synthesis:
variables:
SYN_NAME: "svec"
<<: *syn_template
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -613,6 +613,7 @@ begin
rst_sys_n_i => rst_sys_62m5_n,
rst_n_a_i => rst_sys_62m5_n, ------------ to be removed
fmc_id_i => '0', -- '0' for SPEC; '0' and '1' for each of the TDCs of SVEC
fmc_present_n_i => fmc0_prsnt_m2c_n_i,
pll_sclk_o => fmc0_tdc_pll_sclk_o,
pll_sdi_o => fmc0_tdc_pll_sdi_o,
pll_cs_o => fmc0_tdc_pll_cs_o,
......
......@@ -635,6 +635,7 @@ begin
rst_sys_n_i => rst_sys_62m5_n,
rst_n_a_i => rst_sys_62m5_n, ------------ to be removed
fmc_id_i => '0', -- '0' for SPEC; '0' and '1' for each of the TDCs of SVEC
fmc_present_n_i => fmc0_prsnt_m2c_n_i,
pll_sclk_o => fmc0_tdc_pll_sclk_o,
pll_sdi_o => fmc0_tdc_pll_sdi_o,
pll_cs_o => fmc0_tdc_pll_cs_n_o,
......@@ -716,6 +717,7 @@ begin
rst_sys_n_i => rst_sys_62m5_n,
rst_n_a_i => rst_sys_62m5_n, ------------ to be removed
fmc_id_i => '1', -- '0' for SPEC; '0' and '1' for each of the TDCs of SVEC
fmc_present_n_i => fmc1_prsnt_m2c_n_i,
pll_sclk_o => fmc1_tdc_pll_sclk_o,
pll_sdi_o => fmc1_tdc_pll_sdi_o,
pll_cs_o => fmc1_tdc_pll_cs_n_o,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment