Commit 6160f63b authored by Dimitris Lampridis's avatar Dimitris Lampridis

Merge branch '17-do-a-6-0-4-release' into 'master'

Resolve "Do a 6.0.4 release"

Closes #17

See merge request be-cem-edl/fec/hardware-modules/fmc-adc-100m14b4cha!6
parents fe89e031 21c53031
......@@ -6,6 +6,26 @@
Changelog
=========
6.0.4 - 2022-09-12
==================
Added
=====
- hdl: update to latest releases of all dependencies
- hdl: bitstreams now published under https://be-cem-edl.web.cern.ch/
- sw: support for WRTD FMC-ADC designs
- sw: support for newer Linux kernels
Fixed
=====
- doc: HTML documentation now includes register maps
- sw: compiler warnings
Changed
=======
- bld: many improvements to CI
- bld: build system cleanup
- doc: now published under https://be-cem-edl.web.cern.ch/
6.0.3 - 2022-07-25
==================
Fixed
......
......@@ -7,7 +7,7 @@
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS = -Drelease=$(shell git describe) -Dversion=$(shell git describe | cut -d "-" -f 1 | tr -d "v")
SPHINXOPTS =
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build
......
......@@ -25,6 +25,12 @@ project = 'FMC-ADC-100M-14B-4CHA'
copyright = u'2022, CERN, documentation released under CC-BY-SA-4.0'
author = 'Matthieu Cattin, Dimitris Lampridis <dimitrios.lampridis@cern.ch>, Federico Vaga <federico.vaga@cern.ch>'
import os
import re
release = os.popen('git describe --tags').read().strip()
version = re.sub('^v', '', release.split('-')[0])
# The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string:
#
......@@ -91,3 +97,6 @@ latex_documents = [
# the title page.
#
latex_logo = 'fig/ohr_logo_lowres.png'
# Will be appended to every rst source file in order to provide a reference to the latest version
rst_epilog = '.. |latest_release| replace:: %s' % version
......@@ -28,7 +28,7 @@ here. You can clone the GIT project with the following command::
Within the GIT respository, releases are marked with a TAG named
using the `Semantic Versioning`_. For example the latest release is
``v5.0.0``. You can also find older releases with a different versioning
|latest_release|. You can also find older releases with a different versioning
mechanism.
For each release we will publish the FPGA bitstream for all supported
......
......@@ -394,7 +394,7 @@ begin -- architecture arch
generic map (
g_VENDOR_ID => x"0000_10DC",
g_DEVICE_ID => x"4144_4301", -- "ADC1"
g_VERSION => x"0600_0000",
g_VERSION => x"0600_0004",
g_CAPABILITIES => x"0000_0000",
g_COMMIT_ID => (others => '0'))
port map (
......
......@@ -476,7 +476,7 @@ begin -- architecture arch
generic map (
g_VENDOR_ID => x"0000_10DC",
g_DEVICE_ID => x"4144_4302", -- "ADC2"
g_VERSION => x"0600_0000",
g_VERSION => x"0600_0004",
g_CAPABILITIES => x"0000_0000",
g_COMMIT_ID => (others => '0'))
port map (
......
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