[DistroKit] [PATCH 1/6] doc: hardware: fix malformed table

[DistroKit] [PATCH 1/6] doc: hardware: fix malformed table

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/hardware.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/hardware.rst b/doc/hardware.rst
index f13f0761be1f..72157a9afcb0 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -157,11 +157,11 @@ mips Platform
 mips Platform
 -------------
 
-+-------------------------+------------------------------------------+
++-------------------------+--------------------------------------------+
 | platformconfig:         | ``configs/platform-mipsel/platformconfig`` |
-+-------------------------+------------------------------------------+
++-------------------------+--------------------------------------------+
 | Toolchain architecture: | ``mipsel-softfloat-linux-gnu``             |
-+-------------------------+------------------------------------------+
++-------------------------+--------------------------------------------+
 
 .. toctree::
    :maxdepth: 1
-- 
2.30.2

[DistroKit] [PATCH 2/6] doc: hardware: fix referencing nonexisting documents in toctree

[Roland Hieber]

These two files were merged into one in commit 17e0620b641f671a91a4.

Fixes: 17e0620b641f671a91a4 (2022-04-26, "v7a: rpi: unify rpi{2, 3, cm3}.hdimg into common rpi.hdimg")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/hardware.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/hardware.rst b/doc/hardware.rst
index 72157a9afcb0..3031df1f2470 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -46,8 +46,7 @@ It supports the following hardware:
    hardware_v7a_beaglebone_black
    hardware_v7a_nitrogen6x
    hardware_v7a_riot
-   hardware_v7a_raspi2
-   hardware_v7a_raspi3
+   hardware_v7a_raspi23
    hardware_v7a_udoo_neo
    hardware_v7a_sama5d2
 
-- 
2.30.2

[DistroKit] [PATCH 3/6] doc: hardware: document v7a_noneon platform

[Roland Hieber]

This also fixes the sphinx warning about hardware_v7a_noneon_sama5d3.rst
not being included in any toctree.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/hardware.rst | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/hardware.rst b/doc/hardware.rst
index 3031df1f2470..1f766aac68d5 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -91,6 +91,25 @@ listed above, here is a short overview of the generic way:
 Refer to the :ref:`ptx_dev_manual` for a more thorough documentation.
 
 
+v7a_noneon Platform
+-------------------
+
++-------------------------+------------------------------------------------+
+| platformconfig:         | ``configs/platform-v7a_noneon/platformconfig`` |
++-------------------------+------------------------------------------------+
+| Toolchain architecture: | ``arm-v7a-linux-gnueabihf``                    |
++-------------------------+------------------------------------------------+
+
+The v7a_noneon platform targets machines based on the ARMv7-A architecture
+which don't have support for the NEON SIMD extension.
+It supports the following hardware:
+
+.. toctree::
+   :maxdepth: 1
+
+   hardware_v7a_noneon_sama5d3
+
+
 v8a Platform
 ------------
 
-- 
2.30.2

[DistroKit] [PATCH 4/6] doc: fix some typos

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>

---
… maybe we should consider renaming the project instead to decrease the
number of typos? :D
---
 doc/hardware_mips_qemu.rst   | 2 +-
 doc/hardware_mipsel_qemu.rst | 2 +-
 doc/hardware_v7a_qemu.rst    | 2 +-
 doc/hardware_x86_64_qemu.rst | 2 +-
 doc/intro.rst                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/hardware_mips_qemu.rst b/doc/hardware_mips_qemu.rst
index 657c32fe87c1..ca5049f6fad2 100644
--- a/doc/hardware_mips_qemu.rst
+++ b/doc/hardware_mips_qemu.rst
@@ -3,7 +3,7 @@ QEmu
 
 The mips platform is ready to run in qemu, using the MIPS Malta board simulation.
 
-There are two ways to run DistoKit inside qemu:
+There are two ways to run DistroKit inside qemu:
 
 * With barebox:
   Run ``./configs/platform-mips/run barebox`` to barebox. The barebox should boot
diff --git a/doc/hardware_mipsel_qemu.rst b/doc/hardware_mipsel_qemu.rst
index 0533204a59b6..9805a0acef78 100644
--- a/doc/hardware_mipsel_qemu.rst
+++ b/doc/hardware_mipsel_qemu.rst
@@ -3,7 +3,7 @@ QEmu
 
 The mipsel platform is ready to run in qemu, using the MIPS Malta board
 simulation.
-There are two ways to run DistoKit inside qemu:
+There are two ways to run DistroKit inside qemu:
 
 * With barebox:
   Run ``./configs/platform-mipsel/run barebox`` to barebox. The barebox should
diff --git a/doc/hardware_v7a_qemu.rst b/doc/hardware_v7a_qemu.rst
index 996323e64d42..c993f880ce41 100644
--- a/doc/hardware_v7a_qemu.rst
+++ b/doc/hardware_v7a_qemu.rst
@@ -4,7 +4,7 @@ QEmu
 The v7a platform is ready to run in qemu, using the versatile express
 hardware simulation.
 
-There are two ways to run DistoKit inside qemu:
+There are two ways to run DistroKit inside qemu:
 
 * With barebox:
   Run ``./configs/platform-v7a/run barebox`` to boot the current image with barebox.
diff --git a/doc/hardware_x86_64_qemu.rst b/doc/hardware_x86_64_qemu.rst
index f3dfd77ad70e..e64c23c44f71 100644
--- a/doc/hardware_x86_64_qemu.rst
+++ b/doc/hardware_x86_64_qemu.rst
@@ -3,4 +3,4 @@ QEMU
 
 The x86_64 platform is ready to run in qemu, using the pc-q35-2.12 KVM simulation.
 
-To run DistoKit inside qemu, execute ``./configs/platform-x86_64/run``.
+To run DistroKit inside qemu, execute ``./configs/platform-x86_64/run``.
diff --git a/doc/intro.rst b/doc/intro.rst
index 6a1c8c52e81d..80625e73553a 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -81,7 +81,7 @@ using `git format-patch <https://git-scm.com/docs/git-format-patch>`_ on the
 DistroKit git repository
 (also see its man page for info on using mailers other than *git send-email*).
 
-Mails sent to the DistoKit mailing list are archived on ``lore.distrokit.org``.
+Mails sent to the DistroKit mailing list are archived on ``lore.distrokit.org``.
 Patch series can be fetched with `b4 <https://pypi.org/project/b4/>`_ ::
 
    git config b4.midmask https://lore.distrokit.org/%s
-- 
2.30.2

[DistroKit] [PATCH 5/6] doc: intro: document helper scripts

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/intro.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/intro.rst b/doc/intro.rst
index 80625e73553a..e785f5832b5d 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -116,6 +116,22 @@ using your real name (sorry, no pseudonyms or anonymous contributions)
 to the end of your commit message,
 or if you use Git, make your commit with ``git commit --signoff``.
 
+Maintenance scripts
+~~~~~~~~~~~~~~~~~~~
+
+Before sending your patch, you should run ``ptxdist lint`` and check its output.
+Your patch should not add any new lint errors.
+
+For migrating PTXdist to a new version, there is the wrapper script
+``scripts/p-all`` that runs PTXdist with the supplied arguments on all existing
+platforms in DistroKit, for example::
+
+   $ ./scripts/p-all migrate
+
+The *mips* and *v7a* platforms use config diffs for kernel and/or barebox packages.
+When touching their config files, you can use ``scripts/update-diffs-mips.sh`` and
+``scripts/update-diffs-v7a.sh`` respectively to update the config diffs.
+
 License
 -------
 
-- 
2.30.2

[DistroKit] [PATCH 6/6] scripts: update-diffs-v7a.sh: fix ptxdist path

[Roland Hieber]

Use the same detection logic as in update-diffs-mips.sh, in case a
different PTXdist version is to be used.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 scripts/update-diffs-v7a.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
index 0de34e4f0cde..e684ab697e72 100755
--- a/scripts/update-diffs-v7a.sh
+++ b/scripts/update-diffs-v7a.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
+if [ -z "$PTXDIST" ]; then
+	PTXDIST=ptxdist
+else
+	tput setaf 3 # yellow
+	echo Note: using PTXDIST=$PTXDIST
+	tput sgr 0   # back to normal
+fi
+
 BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
 for pkg in $BAREBOXES; do
-	ptxdist/bin/ptxdist oldconfig $pkg
+	$PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
 done
-- 
2.30.2

Re: [DistroKit] [PATCH 6/6] scripts: update-diffs-v7a.sh: fix ptxdist path

[Jan Lübbe]

On Mon, 2022-09-05 at 13:07 +0200, Roland Hieber wrote:
> Use the same detection logic as in update-diffs-mips.sh, in case a
> different PTXdist version is to be used.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  scripts/update-diffs-v7a.sh | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
> index 0de34e4f0cde..e684ab697e72 100755
> --- a/scripts/update-diffs-v7a.sh
> +++ b/scripts/update-diffs-v7a.sh
> @@ -1,6 +1,14 @@
>  #!/bin/sh
>  
> +if [ -z "$PTXDIST" ]; then
> +       PTXDIST=ptxdist
> +else
> +       tput setaf 3 # yellow
> +       echo Note: using PTXDIST=$PTXDIST
> +       tput sgr 0   # back to normal
> +fi
> +
>  BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-
> vexpress"
>  for pkg in $BAREBOXES; do
> -       ptxdist/bin/ptxdist oldconfig $pkg
> +       $PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
                                                      ^ this should be v7a
>  done

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[DistroKit] [PATCH] fixup! doc: intro: document helper scripts

[Roland Hieber]

---
 scripts/update-diffs-v7a.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
index e684ab697e72..dad3081eb579 100755
--- a/scripts/update-diffs-v7a.sh
+++ b/scripts/update-diffs-v7a.sh
@@ -10,5 +10,5 @@ fi
 
 BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
 for pkg in $BAREBOXES; do
-	$PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
+	$PTXDIST --platformconfig="configs/platform-v7a/platformconfig" oldconfig $pkg
 done
-- 
2.30.2

Re: [DistroKit] [PATCH] fixup! doc: intro: document helper scripts

[Robert Schwebel]

On Tue, Sep 06, 2022 at 03:53:22PM +0200, Roland Hieber wrote:
> ---
>  scripts/update-diffs-v7a.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
> index e684ab697e72..dad3081eb579 100755
> --- a/scripts/update-diffs-v7a.sh
> +++ b/scripts/update-diffs-v7a.sh
> @@ -10,5 +10,5 @@ fi
>  
>  BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
>  for pkg in $BAREBOXES; do
> -	$PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
> +	$PTXDIST --platformconfig="configs/platform-v7a/platformconfig" oldconfig $pkg
>  done
> -- 
> 2.30.2

Squashed.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH 1/6] doc: hardware: fix malformed table

[Robert Schwebel]

On Mon, Sep 05, 2022 at 01:07:04PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  doc/hardware.rst | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Series applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |