Skip to content

Commit ce4b933

Browse files
gastmaierpamolloy
authored andcommitted
docs: getting_started: Clean up documentation
Signed-off-by: Jorge Marques <jorge.marques@analog.com>
1 parent 9ba96b7 commit ce4b933

File tree

2 files changed

+45
-48
lines changed

2 files changed

+45
-48
lines changed

docs/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626

2727
# -- External docs configuration ----------------------------------------------
2828

29+
interref_repos = [
30+
'hdl',
31+
]
32+
2933
intersphinx_mapping = {
3034
'upstream': ('https://docs.kernel.org', None),
3135
'b4': ('https://b4.docs.kernel.org/en/latest', None),

docs/getting_started.rst

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,28 @@ Getting Started
66
Description
77
-----------
88

9-
The Linux kernel in this repository is the `Linux kernel from Xilinx
10-
<https://github.com/Xilinx/linux-xlnx>`__ together with drivers & patches
11-
applied from Analog Devices.
9+
The Linux kernel in this repository is the
10+
`Linux kernel from Xilinx <https://github.com/Xilinx/linux-xlnx>`__
11+
together with drivers & patches applied from Analog Devices.
1212

1313
Details about the drivers that are of interest and supported by this repository
14-
can be found on the :dokuwiki:`Analog Devices wiki
15-
<resources/tools-software/linux-drivers-all>`. This readme focuses on details
16-
specific to how this code is structured/organized, how it was derived, etc.
17-
18-
The current main is based on `xilinx v2024.1
19-
<https://github.com/Xilinx/linux-xlnx/tree/xilinx-v2024.1>`__. For details
20-
about the merge see commit :git-linux:`d31fa3135dbef8bf186a7c42fd87b3eedd8446e9
21-
<commit/d31fa3135dbef8bf186a7c42fd87b3eedd8446e9>` (Merge tag ``xilinx-v2024.1``
22-
of https://github.com/Xilinx/linux-xlnx.git). In this Xilinx release, the
23-
current version of upstream Linux is `Linux 6.6
24-
<https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tag/?h=v6.6>`__.
25-
26-
For legacy reasons, the :git-linux:`xcomm_zynq:` is still available and should
27-
be in-sync with current master. That branch used to be the old master branch.
14+
can be found on the
15+
:dokuwiki:`Analog Devices wiki <resources/tools-software/linux-drivers-all>`.
16+
This readme focuses on details specific to how this code is
17+
structured/organized, how it was derived, etc.
18+
19+
The current main is based on `xilinx v2025.1 <https://github.com/Xilinx/linux-xlnx/tree/xilinx-v2025.1>`__.
20+
For details about the merge see commit
21+
:git-linux:`3b1f15dc5c4d <commit/3b1f15dc5c4de92663059705d6f1cb6fc87d4470+>`
22+
(Merge tag ``xilinx-v2025.1`` of https://github.com/Xilinx/linux-xlnx.git).
23+
In this Xilinx release, the current version of upstream Linux is
24+
`Linux 6.12 <https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tag/?h=v6.12>`__.
2825

2926
How to build
3027
------------
3128

32-
For build instructions :dokuwiki:`check the wiki
33-
<resources/tools-software/linux-drivers-all#building_the_adi_linux_kernel>`.
29+
For build instructions
30+
:dokuwiki:`check the wiki <resources/tools-software/linux-drivers-all#building_the_adi_linux_kernel>`.
3431

3532
Release branches
3633
----------------
@@ -39,14 +36,13 @@ All release branches have the ``[YEAR]_R[NUM]`` format. There are some special
3936
release branches sometimes (like ``2014_R2_altera``, because it wasn't always
4037
possible to match the Linux repo between Xilinx & Intel/Altera.
4138

42-
Each release is matched with a release from the :git-hdl:`HDL repo <>`. The
39+
Each release is matched with a release from the :git-hdl:`HDL repo </>`. The
4340
branching name/model for the HDL repo differs a bit from the one in this repo,
4441
but the matching should be obvious. Therefore, each kernel in the release
4542
branches is be built using the toolchains from a specific version of Vivado &
46-
Quartus. A matching of these can be found :dokuwiki:`on the wiki
47-
<resources/fpga/docs/releases>`. Release branches can be built using other GCC
48-
toolchains, but in the official SD-card images provided, they will use the
49-
toolchains from Vivado/Quartus.
43+
Quartus. A matching of these can be found at :external+hdl:ref:`releases`.
44+
Release branches can be built using other GCC toolchains, but in the official
45+
SD-card images provided, they will use the toolchains from Vivado/Quartus.
5046

5147
Rebased branches
5248
----------------
@@ -55,12 +51,12 @@ Starting with :git-linux:`adi-4.9.0:` there are rebased branches. They're
5551
typically rebased branches from Xilinx with the ADI patches on top so that it's
5652
easier to identify patches that are not yet upstreamed.
5753

58-
For :git-linux:`adi-4.9.0:` the base was branch `xlnx_rebase_v4.9
59-
<https://github.com/Xilinx/linux-xlnx/tree/xlnx_rebase_v4.9>`__ at commit
60-
:git-linux:`d45e196f59364e9f5eafe46027a7d2af349083974
61-
<commit/d45e196f59364e9f5eafe46027a7d2af349083974>` in the ADI repo and commit
62-
`45e196f59364e9f5eafe46027a7d2af349083974
63-
<https://github.com/Xilinx/linux-xlnx/commit/45e196f59364e9f5eafe46027a7d2af349083974>`__
54+
For :git-linux:`adi-4.9.0:` the base was branch
55+
`xlnx_rebase_v4.9 <https://github.com/Xilinx/linux-xlnx/tree/xlnx_rebase_v4.9>`__
56+
at commit
57+
:git-linux:`e5c22c2179cf <commit/e5c22c2179cfbec584d2c540d40a0c3d7a20770c+>`
58+
in the ADI repo and commit
59+
`45e196f59364 <https://github.com/Xilinx/linux-xlnx/commit/45e196f59364e9f5eafe46027a7d2af349083974>`__
6460
in the Xilinx repo. All ADI patches & drivers up to a specific point in time
6561
were cherry-picked to that branch from master. Note that since the
6662
``adi-4.9.0`` branch is the first rebased branch, it's not particularly the
@@ -69,9 +65,8 @@ are somewhat reasonable to take and apply on top of an upstream 4.9 kernel
6965
after some polishing.
7066

7167
The latest rebased branch depends on the current linux version supported in
72-
master. At the time of writing it is 5.10 so that :git-linux:`adi-5.10.0:` is
73-
the latest. Also note that a diff between the latest rebased branch and master
74-
(``git diff master adi-5.10.0``) must be NULL.
68+
master. Also note that a diff between the latest rebased branch and `xlnx-main`
69+
(e.g., ``git diff xlnx-main adi-6.12.0``) must be NULL.
7570

7671
Raspberry Pi branches
7772
---------------------
@@ -81,27 +76,25 @@ drivers present in the master branch should be automatically cherry-picked into
8176
the latest rpi branch.
8277

8378
As in the rebased branches, the latest rpi branch should be in accordance with
84-
the current kernel version supported in master. At the time of writing, the
85-
kernel version in master is 5.10 so that the correspondent latest rpi branch is
86-
:git-linux:`rpi-5.10.y:`.
79+
the current kernel version supported in master.
8780

8881
Intel/Altera branches
8982
---------------------
9083

9184
Because the kernel versions that Intel/Altera were usually not in sync with
9285
Xilinx's, ``altera-*`` branches were created:
9386

94-
- :git-linux:`altera_4.0:`
95-
- :git-linux:`altera_4.4:`
96-
- :git-linux:`altera_4.6:`
97-
- :git-linux:`altera_4.9:`
87+
- :git-linux:`altera_4.0 <altera_4.0:>`
88+
- :git-linux:`altera_4.4 <altera_4.4:>`
89+
- :git-linux:`altera_4.6 <altera_4.6:>`
90+
- :git-linux:`altera_4.9 <altera_4.9:>`
91+
- :git-linux:`altera_4.14 <altera_4.14:>`
9892

99-
These branches are derived from the `Intel/Altera linux kernel repo
100-
<https://github.com/altera-opensource/linux-socfpga>`__, together with some
101-
merged versions of old master branches.
93+
These branches are derived from the
94+
`Intel/Altera linux kernel repo <https://github.com/altera-opensource/linux-socfpga>`__,
95+
together with some merged versions of old master branches.
10296

103-
The hope is that with the upcoming Linux 4.19, these branches would stop
104-
existing, since Intel/Altera seems to keep in sync their kernel version with
105-
more recent non-LTS kernels. Typically the releases/references that are
106-
provided for these boards should already be in the mainline kernel, so these
107-
branches should no longer be needed.
97+
These branches would stop existing, since Intel/Altera seems to keep in sync
98+
their kernel version with more recent non-LTS kernels. Typically the
99+
releases/references that are provided for these boards should already be in the
100+
mainline kernel, so these branches should no longer be needed.

0 commit comments

Comments
 (0)