Skip to content

Commit 10efee3

Browse files
Revert "Conflicting file restored."
This reverts commit 7c3e2da, reversing changes made to 296073c.
1 parent 7c3e2da commit 10efee3

File tree

677 files changed

+4926
-32084
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

677 files changed

+4926
-32084
lines changed

.github/scripts/check_guideline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def check_copyright (list_of_lines, lw, edit_files):
312312
#//
313313
#// 2. An ADI specific BSD license, which can be found in the top level directory
314314
#// of this repository (LICENSE_ADIBSD), and also on-line at:
315-
#// https://github.com/analogdevicesinc/hdl/blob/main/LICENSE_ADIBSD
315+
#// https://github.com/analogdevicesinc/hdl/blob/master/LICENSE_ADIBSD
316316
#// This will allow to generate bit files and not release the source code,
317317
#// as long as it attaches to an ADI device.
318318
#//

.github/scripts/readme_check_guideline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# User guide for [check_guideline.py](https://github.com/analogdevicesinc/hdl/tree/main/.github/scripts/check_guideline.py)
1+
# User guide for [check_guideline.py](https://github.com/analogdevicesinc/hdl/tree/master/.github/scripts/check_guideline.py)
22

33
## Prerequisites
44

@@ -10,7 +10,7 @@
1010

1111
## Rules that are checked
1212

13-
These rules can be found in the [HDL coding guideline](https://github.com/analogdevicesinc/hdl/blob/main/docs/hdl_coding_guideline.md).
13+
These rules can be found in the [HDL coding guideline](https://github.com/analogdevicesinc/hdl/blob/master/docs/hdl_coding_guideline.md).
1414

1515
### 1. License header
1616

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,3 @@ _build
107107
.qsys_edit
108108
.github/CODEOWNERS
109109
.github/PULL_REQUEST_TEMPLATE.md
110-
library/**/.lock
111-
library/**/interfaces/*.sv

README.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ There is no free replacement for consulting services. If you have questions that
4343

4444
## Getting started
4545

46-
This repository supports reference designs for different [Analog Devices boards](../main/projects) based on [Intel and Xilinx FPGA development boards](../main/projects/common) or standalone.
46+
This repository supports reference designs for different [Analog Devices boards](../master/projects) based on [Intel and Xilinx FPGA development boards](../master/projects/common) or standalone.
4747

4848
### Building documentation
4949

50-
Ensure pip is newer than version 23.
51-
```
52-
pip install pip --upgrade
53-
```
5450
Install the documentation tools.
5551
```
56-
(cd docs ; pip install -r requirements.txt --upgrade)
52+
(cd docs ; pip install -r requirements.txt)
5753
```
5854
Build the libraries (recommended).
5955
```
@@ -99,14 +95,12 @@ more information.
9995

10096
* If you want to use the most stable code base, always use the [latest release branch](https://github.com/analogdevicesinc/hdl/releases).
10197

102-
* If you want to use the greatest and latest, check out the [main branch](https://github.com/analogdevicesinc/hdl/tree/main).
98+
* If you want to use the greatest and latest, check out the [master branch](https://github.com/analogdevicesinc/hdl/tree/master).
10399

104100
## Use already built files
105101

106-
You can download already built files and use them as they are.
107-
For the main branch, they are available at the link inside [this document](https://swdownloads.analog.com/cse/boot_partition_files/main/latest_boot.txt). Keep in mind that the ones from the main branch are not stable all the time.
108-
We suggest using the latest release branch [2022_r2, here](https://swdownloads.analog.com/cse/boot_partition_files/2022_r2/latest_boot.txt).
109-
The files are built from [main branch](https://github.com/analogdevicesinc/hdl/tree/main) whenever there are new commits in HDL or Linux repositories.
102+
You can download already built files and use them as they are. They are available on [this link]( https://swdownloads.analog.com/cse/hdl_builds/master/latest_boot_partition.tar.gz).
103+
The files are built from [master branch](https://github.com/analogdevicesinc/hdl/tree/master) whenever there are new commits in HDL or Linux repositories.
110104

111105
> :warning: Pay attention when using already built files, since they are not tested in HW!
112106
@@ -120,14 +114,14 @@ terms.
120114
The user should read each of these license terms, and understand the
121115
freedoms and responsibilities that he or she has by using this source/core.
122116

123-
See [LICENSE](../main/LICENSE) for more details. The separate license files
117+
See [LICENSE](../master/LICENSE) for more details. The separate license files
124118
cab be found here:
125119

126-
* [LICENSE_ADIBSD](../main/LICENSE_ADIBSD)
120+
* [LICENSE_ADIBSD](../master/LICENSE_ADIBSD)
127121

128-
* [LICENSE_GPL2](../main/LICENSE_GPL2)
122+
* [LICENSE_GPL2](../master/LICENSE_GPL2)
129123

130-
* [LICENSE_LGPL](../main/LICENSE_LGPL)
124+
* [LICENSE_LGPL](../master/LICENSE_LGPL)
131125

132126
## Comprehensive user guide
133127

docs/Makefile

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,72 @@ SOURCEDIR = .
55
BUILDDIR = _build
66

77
help:
8+
@echo "For help about the container instance, do \`make container-help\`"
89
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
910

1011
.PHONY: help Makefile
1112

1213
%: Makefile
1314
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
15+
16+
#------------------------------------------------------------------------------
17+
# Container commands
18+
#------------------------------------------------------------------------------
19+
20+
CONTAINER_IMG ?=hdl-docs
21+
CONTAINER_ENGINE =podman
22+
CONTAINER_REPO =${CONTAINER_IMG}
23+
CONTAINER_IMAGE =${CONTAINER_IMG}_build
24+
CONTAINER_VERSION ?=0.1
25+
CONTAINER_SHELL ?=bash -l
26+
CONTAINER_RUN_EXTRA ?=
27+
CONTAINER_FORMAT =$(if $(filter podman,${CONTAINER_ENGINE}),--format docker,)
28+
29+
IF_CONTAINER_RUNS=$(shell ${CONTAINER_ENFINE} container inspect -f '{{.State.Running}}' ${CONTAINER_IMAGE} 2>/dev/null)
30+
31+
CONTAINER_RUN_PARAMS = -it --rm --name=${CONTAINER_IMG} \
32+
--name=${CONTAINER_IMAGE} \
33+
--workdir=/${CONTAINER_IMG} \
34+
--mount type=bind,source=${CURDIR}/../,target=/${CONTAINER_IMG} \
35+
${CONTAINER_RUN_EXTRA} \
36+
${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION}
37+
38+
container-login:
39+
@if [ "${IF_CONTAINER_RUNS}" != "true" ]; then \
40+
${CONTAINER_ENGINE} run ${CONTAINER_RUN_PARAMS} \
41+
${CONTAINER_SHELL}; \
42+
else \
43+
${CONTAINER_ENGINE} exec -it ${CONTAINER_IMAGE} \
44+
${CONTAINER_SHELL}; \
45+
fi
46+
47+
container-build:
48+
@printf "Building container image\n"
49+
@${CONTAINER_ENGINE} build --no-cache=true ${CONTAINER_FORMAT} -t ${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION} -f ./Containerfile .
50+
51+
52+
container-html:
53+
@${CONTAINER_ENGINE} run ${CONTAINER_RUN_PARAMS} ${CONTAINER_SHELL} -c \
54+
"source /.venv/bin/activate ; cd docs ; make html"
55+
56+
container-pdf:
57+
@${CONTAINER_ENGINE} run ${CONTAINER_RUN_PARAMS} ${CONTAINER_SHELL} -c \
58+
"source /.venv/bin/activate ; cd docs ; make latexpdf"
59+
60+
container-clean:
61+
@${CONTAINER_ENGINE} run ${CONTAINER_RUN_PARAMS} ${CONTAINER_SHELL} -c \
62+
"source /.venv/bin/activate ; cd docs ; make clean"
63+
64+
.PHONY: container-build container-login container-html container-pdf container-clean
65+
66+
container-help:
67+
@printf "The container commands allow to use a container to build the documentation.\n"
68+
@printf "Both podman and docker are supported, change the CONTAINER_ENGINE variable to select which to use.\n\n"
69+
@printf "Usage: make [options]\n"
70+
@printf "\
71+
Options:\n\
72+
container-build Build the container image with dependencies (do once).\n\
73+
container-login Access the container shell.\n\
74+
container-html Build html documentation.\n\
75+
container-latexpdf Build pdf documentation.\n\
76+
\n"

docs/conf.py

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
# -- Project information ------------------------------------------------------
1+
# Configuration file for the Sphinx documentation builder.
2+
#
3+
# https://www.sphinx-doc.org/en/master/usage/configuration.html
24

3-
repository = 'hdl'
4-
project = 'HDL'
5-
copyright = '2024, Analog Devices, Inc.'
6-
author = 'Analog Devices, Inc.'
5+
# -- Project information -----------------------------------------------------
76

8-
# -- General configuration ----------------------------------------------------
7+
project = 'HDL, Analog Devices'
8+
copyright = '2023, Analog Devices Inc'
9+
author = 'Analog Devices Inc'
10+
release = 'v0.1'
11+
12+
# -- General configuration ---------------------------------------------------
13+
14+
import os, sys
15+
16+
user = os.environ.get("USER")
17+
sys.path.append(os.path.abspath("./extensions"))
918

1019
extensions = [
11-
"sphinx.ext.todo",
12-
"sphinx.ext.intersphinx",
13-
"sphinxcontrib.wavedrom",
14-
"adi_doctools"
20+
"sphinx.ext.todo",
21+
"sphinx.ext.viewcode",
22+
"sphinxcontrib.wavedrom",
23+
"symbolator_sphinx",
24+
"adi_links",
25+
"adi_hdl_parser"
1526
]
1627

17-
needs_extensions = {
18-
'adi_doctools': '0.3'
19-
}
28+
templates_path = ['sources/template']
2029

2130
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
22-
source_suffix = '.rst'
23-
24-
# -- External docs configuration ----------------------------------------------
2531

26-
intersphinx_mapping = {
27-
'doctools': ('https://analogdevicesinc.github.io/doctools', None)
28-
}
29-
30-
# -- Custom extensions configuration ------------------------------------------
32+
# -- Custom extensions configuration -------------------------------------------
3133

3234
hide_collapsible_content = True
3335
validate_links = False
@@ -37,9 +39,15 @@
3739
todo_include_todos = True
3840
todo_emit_warnings = True
3941

42+
# -- Symbolator configuration -------------------------------------------------
43+
44+
symbolator_cmd = f"/home/{user}/.local/bin/symbolator"
45+
symbolator_cmd_args = ['-t', '--scale=0.75']
46+
4047
# -- Options for HTML output --------------------------------------------------
4148

42-
html_theme = 'cosmic'
49+
html_theme = 'furo'
4350
html_static_path = ['sources']
51+
source_suffix = '.rst'
4452
html_css_files = ["custom.css"]
4553
html_favicon = "sources/icon.svg"

0 commit comments

Comments
 (0)