Skip to content

Commit fcadb14

Browse files
schellegskalade
authored andcommitted
Documentation updates
1 parent f2bb52e commit fcadb14

33 files changed

+330
-122
lines changed

docs/source/appendix/references.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PUTTY (terminal emulation software)
1818

1919
Pynq Technical support
2020
======================
21-
* `Pynq Technical support <http://www.pynq.io/support.html>`_
21+
* `Pynq Technical support <https://discuss.pynq.io/>`_
2222

2323
Python built-in functions
2424
=========================
@@ -29,7 +29,7 @@ Python training
2929
* `The Python Tutorial from the Python development team <https://docs.python.org/3.5/tutorial/>`_
3030
* `Google Python training including videos <https://developers.google.com/edu/python/introduction>`_
3131
* `Python Tutor including visualization of Python program execution <http://www.pythontutor.com/>`_
32-
* `20 Best Free Tutorials to Learn Python as of 9 Oct 2015 <http://noeticforce.com/best-free-tutorials-to-learn-python-pdfs-ebooks-online-interactive>`_
32+
* `20 Best Free Tutorials to Learn Python as of 10 Nov 2021 <http://noeticforce.com/best-free-tutorials-to-learn-python-pdfs-ebooks-online-interactive>`_
3333

3434
reStructuredText
3535
================

docs/source/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ def __getattr__(cls, name):
6969

7070
# General information about the project.
7171
project = 'PYNQ: Python productivity for Xilinx platforms'
72-
copyright = '2021, Xilinx'
73-
author = 'Xilinx'
72+
copyright = '2022, AMD-Xilinx'
73+
author = 'AMD-Xilinx'
7474

7575
# The version info for the project you're documenting, acts as replacement for
7676
# |version| and |release|, also used in various other places throughout the
7777
# built documents.
7878
#
7979
# The short X.Y version.
80-
version = '2.7'
80+
version = '3.0'
8181
# The full version, including alpha/beta/rc tags.
82-
release = '2.7'
82+
release = '3.0'
8383

8484
# The language for content autogenerated by Sphinx. Refer to documentation
8585
# for a list of supported languages.

docs/source/getting_started.rst

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
Getting Started
33
***************
44

5-
You need a supported Xilinx platform to get started. How you get PYNQ depends
5+
You need a supported AMD-Xilinx platform to get started. How you get PYNQ depends
66
on your platform. For some Zynq|Zynq Ultrascale+ platforms you can download
7-
an SD card image to boot the board. For other platforms, including Alveo, you
8-
can install PYNQ onto your host Operating System.
7+
an SD card image to boot the board. For other platforms, including Alveo and Kria
8+
SoMs, you can install PYNQ onto your host Operating System.
99

1010
If you have one of the following boards, you can follow the quick start guide.
1111
Go to the `PYNQ support forum <https://discuss.pynq.io/>`_ for help.
@@ -21,9 +21,17 @@ Zynq, Zynq Ultrascale+ and Zynq RFSoC
2121
getting_started/zcu104_setup.rst
2222

2323
* `Ultra96 <https://ultra96-pynq.readthedocs.io/en/latest/getting_started.html>`_
24-
* `RFSoC 2x2 <https://www.rfsoc-pynq.io/getting_started.html>`_
2524
* `PYNQ-ZU <https://xilinx.github.io/PYNQ-ZU/getting_started.html>`_
2625

26+
.. *
27+
28+
* `RFSoC-PYNQ <https://www.rfsoc-pynq.io/getting_started.html>`_
29+
30+
Kria SoMs
31+
=========
32+
33+
* `Kria-PYNQ <http://github.com/Xilinx/Kria-PYNQ>`_
34+
2735
Alveo and XRT supported platforms
2836
=================================
2937

docs/source/images/pmod_tmp2_8pin.JPG

100755100644
-46 Bytes
Loading

docs/source/overlay_design_methodology.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Overlay Design Methodology
55
**************************
66

77
PYNQ *Overlays* are analogous to software
8-
libraries. A programmer can download overlays into the Xilinx Programmable
8+
libraries. A programmer can download overlays into the AMD-Xilinx Programmable
99
Logic at runtime to
1010
provide functionality required by the software application.
1111

@@ -27,9 +27,9 @@ There are a number of components required in the process of creating an overlay:
2727

2828
While they are conceptually similar, there are differences in the process for
2929
building Overlays for different platforms. i.e. Zynq vs. Zynq Ultrascale+ vs.
30-
Alveo platforms. Most of the differences relate to the configuration of the
30+
Kria SoM vs. Alveo platforms. Most of the differences relate to the configuration of the
3131
Zynq/Zynq Ultrascale+ PS, and the interfaces between the host processor and the
32-
programmable logic. E.g. AXI interfaces for ARM & Zynq/Zynq Ultrascale+, and
32+
programmable logic. E.g. AXI interfaces for ARM & Zynq/Zynq Ultrascale+/Kria SoM, and
3333
PCIe for x86|IBM|ARM|etc. for Alveo. Most of the differences will be related to
3434
the hardware (Programmable logic) design.
3535

docs/source/overlay_design_methodology/python_packaging.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ version-control the following files anymore:
148148

149149
* MicroBlaze binaries (e.g., `pmod_adc.bin`)
150150

151-
We refrain from keeping tracking of these large files; instead, we rely on the
151+
We refrain from keeping track of these large files; instead, we rely on the
152152
SD build flow to update them automatically in each build. Some side-effects
153153
are shown below:
154154

@@ -187,11 +187,11 @@ If you are not on a PYNQ image (other OS), the above `pip3 install`
187187
is only for the pynq Python library installation; you also need
188188
2 additional services to be started for pynq to be fully-functional.
189189

190-
* PL server service. (Check
191-
<PYNQ-repo>/sdbuild/packages/pynq for more information).
192-
193190
* Jupyter notebook service. (Check
194191
<PYNQ-repo>/sdbuild/packages/jupyter/start_jupyter.sh as an example).
192+
193+
* Clear PL Statefile service. (Check
194+
<PYNQ-repo>/sdbuild/packages/clear_pl_statefile for more information).
195195

196196
Using ``pynq`` as a Dependency
197197
------------------------------

docs/source/pynq_cli.rst

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ when you type ``pynq subcommand`` it looks for an available executable named
2424

2525
Therefore, to add new functionalities to the PYNQ CLI, it is sufficient to make
2626
a new executable available that follow this naming structure. For example, to
27-
manage instances of a device server, the ``pynq-server`` executable is created,
28-
and it will be called by typing ``pynq server`` in the command line.
27+
download the collatoral for all installed notebooks, the ``pynq-get-notebooks`` executable is created,
28+
and it will be called by typing ``pynq get-notebooks`` in the command line.
2929

3030
Printing the Help Message
3131
-------------------------
@@ -55,26 +55,6 @@ useful for diagnosing issues and bug reporting.
5555
Available subcommands
5656
---------------------
5757

58-
Device Server Management
59-
^^^^^^^^^^^^^^^^^^^^^^^^
60-
The ``pynq server`` command is used to manage instances of device servers. You
61-
can either ``start`` or ``stop`` the server by typing the intended command as
62-
follows
63-
64-
.. code:: bash
65-
66-
pynq server start
67-
68-
And you can also get a help message by typing
69-
70-
.. code:: bash
71-
72-
pynq server --help
73-
74-
.. note:: As of now, we recommend not to use the ``pynq server`` subcommand on
75-
Zynq and Zynq Ultrascale+ devices, as the device server in these cases is
76-
already managed by a system service provided in the PYNQ SD card image.
77-
7858
Get the Available Notebooks
7959
^^^^^^^^^^^^^^^^^^^^^^^^^^^
8060
The ``pynq get-notebooks`` command is responsible for the delivery of notebooks.
@@ -122,7 +102,7 @@ You can get a list of the available notebooks by using the ``--list`` option
122102
When running ``pynq get-notebooks`` overlays are potentially downloaded
123103
automatically from the network based on the target device. Therefore, there is
124104
the possibility that some overlays will not be available for your device, and
125-
you will have to synthesize the manually from source. In case the overlays
105+
you will have to synthesize them manually from source. In case the overlays
126106
associated with certain notebooks are not found for your device, these notebooks
127107
will not be delivered. If, however, you want to get the notebooks anyway,
128108
ignoring the automatic overlays lookup, you can pass the ``--ignore-overlays``

docs/source/pynq_libraries.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ embedded system is typically limited, and the GPIO are controlled by the
1111
main CPU. As the main CPU which is managing the rest of the system, GPIO
1212
performance is usually limited.
1313

14-
Xilinx platforms usually have many more IO pins available than a typical embedded
14+
AMD-Xilinx platforms usually have many more IO pins available than a typical embedded
1515
system. Dedicated hardware controllers and additional soft (real-time) processors can be
1616
built in Programmable Logic. This means
1717
performance on these interfaces can be much higher than other embedded systems.

docs/source/pynq_libraries/arduino.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Subsystem, a configurable switch, and the following AXI controllers:
6363
* 1V peak-to-peak *
6464

6565
.. warning::
66-
Analog inputs are supported via the internal Xilinx XADC. This supports inputs
66+
Analog inputs are supported via the internal AMD-Xilinx XADC. This supports inputs
6767
of 1V peak-to-peak. Note that the Arduino interface supports 0-5V analog inputs
6868
which is not supported by Zynq without external circuitry.
6969

docs/source/pynq_libraries/debugbridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ attaching a JTAG adapter.
2121

2222
Another use case is to control a Debug Bridge IP in *AXI to JTAG*
2323
configuration. In this config, the Debug Bridge runs as
24-
a remote JTAG adapter for another Xilinx FPGA with its JTAG pins
24+
a remote JTAG adapter for another AMD-Xilinx FPGA with its JTAG pins
2525
connected to the Debug Bridge in the PYNQ host.
2626

2727
This class provides a Python implementation of the XVC server v1.0

docs/source/pynq_overlays.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PYNQ Overlays
55
*************
66

7-
The Xilinx® Zynq® All Programmable device is an SOC based on a dual-core ARM®
7+
The AMD-Xilinx® Zynq® All Programmable device is an SOC based on a dual-core ARM®
88
Cortex®-A9 processor (referred to as the *Processing System* or **PS**),
99
integrated with FPGA fabric (referred to as *Programmable Logic* or **PL**). The
1010
*PS* subsystem includes a number of dedicated peripherals (memory controllers,

docs/source/pynq_overlays/pynqz1/pynqz1_base_overlay.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ A Makefile is provided to rebuild the base overlay in Linux. The Makefile calls
184184
two tcl files. The first Tcl files compiles any HLS IP used in the design. The
185185
second Tcl builds the overlay.
186186

187-
To rebuild the overlay, source the Xilinx tools first. Then assuming PYNQ has
187+
To rebuild the overlay, source the AMD-Xilinx tools first. Then assuming PYNQ has
188188
been cloned:
189189

190190
.. code-block:: console
@@ -210,7 +210,7 @@ Assuming PYNQ has been cloned:
210210
source ./build_base_ip.tcl
211211
source ./base.tcl
212212
213-
To build from the command line, open the Vivado 2017.4 Tcl Shell, and run the
213+
To build from the command line, open the Vivado Tcl Shell, and run the
214214
following:
215215

216216
.. code-block:: console

docs/source/pynq_overlays/pynqz1/pynqz1_logictools_overlay.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ The project files for the logictools overlay can be found here:
9797
9898
Linux
9999
^^^^^
100-
To rebuild the overlay, source the Xilinx tools first. Then assuming PYNQ has
100+
To rebuild the overlay, source the AMD-Xilinx tools first. Then assuming PYNQ has
101101
been cloned:
102102

103103
.. code-block:: console
@@ -120,7 +120,7 @@ Assuming PYNQ has been cloned:
120120
source ./build_logictools_ip.tcl
121121
source ./logictools.tcl
122122
123-
To build from the command line, open the Vivado 2017.4 Tcl Shell, and run the
123+
To build from the command line, open the Vivado Tcl Shell, and run the
124124
following:
125125

126126
.. code-block:: console

docs/source/pynq_overlays/pynqz2/pynqz2_base_overlay.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ A Makefile is provided to rebuild the base overlay in Linux. The Makefile calls
167167
two tcl files. The first Tcl files compiles any HLS IP used in the design. The
168168
second Tcl builds the overlay.
169169

170-
To rebuild the overlay, source the Xilinx tools first. Then assuming PYNQ has
170+
To rebuild the overlay, source the AMD-Xilinx tools first. Then assuming PYNQ has
171171
been cloned:
172172

173173
.. code-block:: console
@@ -193,7 +193,7 @@ Assuming PYNQ has been cloned:
193193
source ./build_base_ip.tcl
194194
source ./base.tcl
195195
196-
To build from the command line, open the Vivado 2017.4 Tcl Shell, and run the
196+
To build from the command line, open the Vivado Tcl Shell, and run the
197197
following:
198198

199199
.. code-block:: console

docs/source/pynq_overlays/pynqz2/pynqz2_logictools_overlay.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The project files for the logictools overlay can be found here:
116116
117117
Linux
118118
^^^^^
119-
To rebuild the overlay, source the Xilinx tools first. Then assuming PYNQ has
119+
To rebuild the overlay, source the AMD-Xilinx tools first. Then assuming PYNQ has
120120
been cloned:
121121

122122
.. code-block:: console
@@ -139,7 +139,7 @@ Assuming PYNQ has been cloned:
139139
source ./build_logictools_ip.tcl
140140
source ./logictools.tcl
141141
142-
To build from the command line, open the Vivado 2017.4 Tcl Shell, and run the
142+
To build from the command line, open the Vivado Tcl Shell, and run the
143143
following:
144144

145145
.. code-block:: console

docs/source/pynq_overlays/zcu104.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Power
5252

5353
For details on the ZCU104 board including reference manual, schematics,
5454
constraints file (xdc),
55-
see the `Xilinx ZCU104 webpage <https://www.xilinx.com/products/boards-and-kits/zcu104.html>`_
55+
see the `AMD-Xilinx ZCU104 webpage <https://www.xilinx.com/products/boards-and-kits/zcu104.html>`_
5656

5757
The following overlays are include by default in the PYNQ image for the ZCU104 board:
5858

docs/source/pynq_overlays/zcu104/zcu104_base_overlay.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ A Makefile is provided to rebuild the base overlay in Linux. The Makefile calls
123123
two tcl files. The first Tcl files compiles any HLS IP used in the design. The
124124
second Tcl builds the overlay.
125125

126-
To rebuild the overlay, source the Xilinx tools first. Then assuming PYNQ has
126+
To rebuild the overlay, source the AMD-Xilinx tools first. Then assuming PYNQ has
127127
been cloned:
128128

129129
.. code-block:: console

docs/source/pynq_package.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Sub-packages:
5454
pynq_package/pynq.devicetree
5555
pynq_package/pynq.gpio
5656
pynq_package/pynq.interrupt
57+
pynq_package/pynq.metadata
5758
pynq_package/pynq.mmio
5859
pynq_package/pynq.overlay
5960
pynq_package/pynq.pl
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.. _pynq-metadata:
2+
3+
pynq.metadata Package
4+
======================
5+
6+
The pynq.metadata module contains the required modules for managing the Overlay metadata.
7+
The metadata can be extracted from a HWH file or an XSA and contains the complete hardware
8+
design. This module also contains a collection of different views onto the metadata that
9+
present the metadata as the traditional PYNQ dicts.
10+
11+
Modules:
12+
* :mod:`pynq.metadata.runtime_metadata_parser` - A wrapper class that provides a collection of different view onto the metadata.
13+
* :mod:`pynq.metadata.metadata_view` - A base class for metadata views providing getters and iterators.
14+
* :mod:`pynq.metadata.ip_dict_view` - A view onto the metadata that displays the ip_dict.
15+
* :mod:`pynq.metadata.mem_dict_view` - A view onto the metadata that displays the mem_dict.
16+
* :mod:`pynq.metadata.interrupt_controllers_view` - A view onto the metadata that displays the interrupt_controllers dictionary.
17+
* :mod:`pynq.metadata.hierarchy_dict_view` - A view onto the metadata that displays the hierarchy_dict.
18+
* :mod:`pynq.metadata.gpio_dict_view` - A view onto the metadata that displays the gpio_dict.
19+
* :mod:`pynq.metadata.clock_dict_view` - A view onto the metadata that displays the clock_dict.
20+
21+
.. toctree::
22+
:hidden:
23+
24+
pynq.metadata/pynq.pl_server.runtime_metadata_parser
25+
pynq.metadata/pynq.pl_server.metadata_view
26+
pynq.metadata/pynq.pl_server.ip_dict_view
27+
pynq.metadata/pynq.pl_server.mem_dict_view
28+
pynq.metadata/pynq.pl_server.interrupt_controllers_view
29+
pynq.metadata/pynq.pl_server.hierarchy_dict_view
30+
pynq.metadata/pynq.pl_server.gpio_dict_view
31+
pynq.metadata/pynq.pl_server.clock_dict_view
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.. _pynq-metadata-clock_dict_view:
2+
3+
pynq.metadata-clock_dict_view Module
4+
================================================
5+
6+
Provides a view onto the Metadata object that displays all
7+
configurable clocks in the system. Models a dictionary, where
8+
the key is the index for the clock and the values contain:
9+
10+
* ``enable`` : ``int`` whether the clock is enabled, ``1`` when enabled, ``0`` when disabled.
11+
* ``divisor0`` : ``int`` divisor value for the clock
12+
* ``divisor1`` : ``int`` divisor value for the clock
13+
14+
.. automodule:: pynq.metadata.clock_dict_view
15+
:members:
16+
:undoc-members:
17+
:show-inheritance:
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.. _pynq-metadata-gpio_dict_view:
2+
3+
pynq.metadata-gpio_dict_view Module
4+
================================================
5+
6+
Provides a view onto the Metadata object that displays all
7+
GPIO pins controlled by the PS. Models a dictionary where
8+
the keys are the names of the pin and each entry contains:
9+
10+
* the index of the pin :``int``
11+
* the current state of the pin : ``str``
12+
13+
14+
.. automodule:: pynq.metadata.gpio_dict_view
15+
:members:
16+
:undoc-members:
17+
:show-inheritance:

0 commit comments

Comments
 (0)