move WIP u-boot modifications in libre-testing

I asked bill-auger to push his modifications so he uploaded the
packages to libre-testing and the PKGBUILD modifications to abslibre.

Since the pakcages have been uploaded to libre-testing it's better to
move them here.

While the code is not ready yet, it enables users to test the new
u-boot which fixes the Ethernet PHY. From linux-sunxi we have[1]:
    Proper fix for rev. F and newer is to apply trace length
    compensation at the PHY.

    This is done by default (also for rev. H and newer despite commit
    message mentioning only realtek not Micrel) since mainline linux
    v5.15 and since mainline u-boot v2022.04;

[1]https://linux-sunxi.org/Olimex_A20-OLinuXino-Lime2#calibrate_at_PHY

That page also has more background on the issue being fixed here
(basically making all the various Lime 2 A20 revisions (which have
different Ethernet PHY) work with the same u-boot binary / package.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

8 files changed, 967 insertions, 30 deletions

diff --git a/libre-testing/uboot4extlinux-sunxi/0001-Add-tool-to-dump-sunxi-images.patch b/libre-testing/uboot4extlinux-sunxi/0001-Add-tool-to-dump-sunxi-images.patch
new file mode 100644
index 000000000..ee89767f2
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/0001-Add-tool-to-dump-sunxi-images.patch
@@ -0,0 +1,85 @@
+From b4e67c5112b8d8ec8f9255af057c3515c5ea71c1 Mon Sep 17 00:00:00 2001
+From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+Date: Sat, 29 May 2021 19:14:22 +0200
+Subject: [PATCH] Add tool to dump sunxi images
+
+  $./tools/dumpimage -l ~/work/temp/lime1.img
+  Allwinner eGON image, size: 24576 bytes
+  	SPL header version 0.2
+  	DT name: sun7i-a20-olinuxino-lime2-emmc
+  $ ./tools/dumpimage -l ~/work/temp/parabola.img
+  Allwinner eGON image, size: 24576 bytes
+  	SPL header version 0.2
+  	DT name: sun7i-a20-olinuxino-lime2-emmc
+
+TODO:
+- why do we have the lime2 dt detected above? is the
+  env a leftover from the previous image somehow?
+- Handle block devices:
+  $ sudo ./tools/dumpimage -l /dev/sdb
+  Image Type:   MVEBU Boot from (null) Image
+  Image version:0
+  Data Size:    -4 Bytes = 4194304.00 KiB = 4096.00 MiB
+  Load Address: 00000000
+  Entry Point:  00000000
+- Make it easily parsable by tools
+- Force type to sunxi_egon
+
+Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+---
+ tools/dumpimage.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/tools/dumpimage.c b/tools/dumpimage.c
+index e5481435a7..9d0d0c448b 100644
+--- a/tools/dumpimage.c
++++ b/tools/dumpimage.c
+@@ -71,6 +71,9 @@ int main(int argc, char **argv)
+ 	char *ptr;
+ 	int retval = EXIT_SUCCESS;
+ 	struct image_type_params *tparams = NULL;
++	off_t offset = 0;
++
++	offset = 8192; /* Allwinner SOCs */
+ 
+ 	params.cmdname = *argv;
+ 
+@@ -159,6 +162,14 @@ int main(int argc, char **argv)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
++	/*  Handle block devices */
++	if (sbuf.st_size == 0) {
++		/* 1M should be sufficient as we have the first partition that
++		 * is typically aligned at 1M for MBR partitioning.
++		 */
++		sbuf.st_size = 1024*1024;
++	}
++
+ 	if ((uint32_t)sbuf.st_size < tparams->header_size) {
+ 		fprintf(stderr, "%s: Bad size: \"%s\" is not valid image\n",
+ 			params.cmdname, params.imagefile);
+@@ -182,7 +193,7 @@ int main(int argc, char **argv)
+ 		 * Extract the data files from within the matched
+ 		 * image type. Returns the error code if not matched
+ 		 */
+-		retval = dumpimage_extract_subimage(tparams, ptr, &sbuf);
++		retval = dumpimage_extract_subimage(tparams, ptr + offset, &sbuf);
+ 		if (retval)
+ 			fprintf(stderr, "%s: Can't extract subimage from %s\n",
+ 				params.cmdname, params.imagefile);
+@@ -191,10 +202,9 @@ int main(int argc, char **argv)
+ 		 * Print the image information for matched image type
+ 		 * Returns the error code if not matched
+ 		 */
+-		retval = imagetool_verify_print_header(ptr, &sbuf, tparams,
++		retval = imagetool_verify_print_header(ptr + offset, &sbuf, tparams,
+ 						       &params);
+ 	}
+-
+ 	(void)munmap((void *)ptr, sbuf.st_size);
+ 	(void)close(ifd);
+ 
+-- 
+2.31.1
+
diff --git a/libre-testing/uboot4extlinux-sunxi/PKGBUILD b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
new file mode 100644
index 000000000..513ed74e3
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
@@ -0,0 +1,526 @@
+# U-Boot: sunXi
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+# Maintainer: Parabola hackers <dev@lists.parabola.nu>
+
+# To add a new board (that uses an Allwinner System On a Chip) you need:
+# - The package name. Example: uboot4extlinux-a20-olinuxino_micro
+# - The u-boot configuration. Example: A20-OLinuXino_MICRO_defconfig
+# - The name of the board(s). Example: A20 OLinuXino Micro
+#   A single package / u-boot configuration sometimes support multiple
+#   boards and the configuration name doesn't always have the boards names
+#   in it. Example: uboot4extlinux-am335x_bone supports various BeagleBones,
+#   the AM335x GP EVM and the EVM SK all in one u-boot binary and package.
+# - If relevant, the packages it replaces, if there are older u-boot packages
+#   also supporting that board. Example:uboot-a20-olinuxino-micro
+#
+# Ideally we'd like to enable people to only add these 4 variables in this
+# package to add a new board. These 4 variables could go in something like
+# a CVS file that is parsed, but that would require to be able to dynamically
+# define packages, but even if eval package_{$_pkgname}() { [...] } works,
+# it doesn't make that package function visible to makepkg.
+#
+# Because of that, contributors wanting to add new boards will have to search
+# for example of the information mentioned above and add it in the PKGBUILD
+# for their boards.
+#
+# After adding a new board in this PKGBUILD, to get the board officially
+# supported by Parabola.you also need to create a page for it in the
+# Parabola wiki for that board and update the ARM installation guide to
+# point to it when relevant. Examples of that are available for other
+# boards in the ARM installation guide.
+
+_upstream_name=u-boot-libre
+pkgbase=uboot4extlinux-sunxi
+pkgname=("${pkgbase}"
+         'uboot4extlinux-a10-olinuxino-lime'
+         'uboot4extlinux-a10s-olinuxino-m'
+         'uboot4extlinux-a13-olinuxino'
+         'uboot4extlinux-a13-olinuxinom'
+         'uboot4extlinux-a20-olinuxino-lime'
+         'uboot4extlinux-a20-olinuxino-lime2'
+         'uboot4extlinux-a20-olinuxino-lime2-emmc'
+         'uboot4extlinux-a20-olinuxino_micro'
+         'uboot4extlinux-bananapi'
+         'uboot4extlinux-bananapro'
+         'uboot4extlinux-chip'
+         'uboot4extlinux-cubieboard'
+         'uboot4extlinux-cubieboard2'
+         'uboot4extlinux-cubietruck'
+         'uboot4extlinux-linksprite_pcduino'
+         'uboot4extlinux-linksprite_pcduino3'
+         'uboot4extlinux-linksprite_pcduino3_nano'
+         'uboot4extlinux-orangepi_2'
+         'uboot4extlinux-orangepi_one'
+         'uboot4extlinux-orangepi_pc'
+         'uboot4extlinux-orangepi_plus')
+
+_uboot_ver=2022.04 # version of the upstream u-boot source code
+_ubootlibre_rev=r1 # revision of the u-boot-libre deblob script
+
+pkgver="${_uboot_ver}"
+pkgrel="${_ubootlibre_rev}.parabola3"
+
+arch=('armv7h' 'i686' 'x86_64')
+url="https://libreboot.org/docs/maintain/#resourcesscriptsbuildreleaseu-boot-libre"
+license=('GPL')
+makedepends=('bc' 'dtc' 'python' 'python-setuptools' 'python2' 'swig')
+makedepends_i686+=('arm-none-eabi-gcc')
+makedepends_ppc64le+=('arm-none-eabi-gcc')
+makedepends_x86_64+=('arm-none-eabi-gcc')
+
+_mirror="https://mirrors.mit.edu/libreboot/" # use a mirror per libreboot's request
+source=("${_mirror}/${_upstream_name}/${_uboot_ver}-${_ubootlibre_rev}/${_upstream_name}-${_uboot_ver}-${_ubootlibre_rev}.tar.xz")
+source+=('extlinux.conf'
+        "${pkgbase}.hook.in"
+        'install-uboot4extlinux.sh.in'
+        "generate-${pkgbase}-install-text.sh")
+
+# TODO: this checksum doesn't correspond to the one in
+#       tests/u-boot-libre.sha512. This means that the tarball is not
+#       reproducible yet. According to diffoscope, the only changes so
+#       far seems to be some permissions changes:
+#       │ -drwxr-xr-x [...]     0 1969-12-31 23:00:00.000000 u-boot-libre-2021.07-r1/
+#       │ +drwxrwxr-x [...]     0 1969-12-31 23:00:00.000000 u-boot-libre-2021.07-r1/
+#       │ --rw-r--r-- [...] 16576 1969-12-31 23:00:00.000000 u-boot-libre-2021.07-r1/.azure-pipelines.yml
+#       │ +-rw-rw-r-- [...] 16576 1969-12-31 23:00:00.000000 u-boot-libre-2021.07-r1/.azure-pipelines.yml
+#       I've not checked if some files were added or not but at least it
+#       shows only diffs like the one above, and it doesn't show any file
+#       content diff.
+# TODO: Check the signatures of the released files, not just the content
+# TODO: We also need to look into drivers/dma/MCD_tasks.c. The debian
+#       version of u-boot removes it. It's some data that looks like
+#       code, so while there is a valid license, we might lack
+#       corresponding source code if it's really some code. The debian
+#       commits might have more information about it.
+sha512sums=('b816667988210c4f5e0e219fcf633fe0c599ced74568a2924afc8df14bede52ce0c9615ff27eae3ecf194d41a87d04231f099c90beece18028ee5890a3911669')
+sha512sums+=('dcbcbc8d196c7dd7db1a8a30dfa8c9ece5d241580bdf593df5fa2de527f0dfea2bb76ff9bfe49fb1e9d631bd1e4b95c828a41cfb38dc2ddc9553e18a54a521f0'
+             '766b28c45218746672d3e802c16f2c1283d708b43edf0a42cb569c1cfa6d6d3f318d5da91efcc832303dcc2175ee23528d15891010c187dea4c6828e82596be3'
+             '1ecb7b932bb0b097cac2cdfabbf7faa1601a556b49782f68109be07e49bff62d4515d6492ad1c72f471cdc7b4e1c2d8750e3494fcb0fc93108e6e5bd4e82aedb'
+             'b0e8b0ec7f742778ffed486cf529d56d550db48354a4251867078fda8e5a28c8938f6c005225042744c1117a6abb3843e632234b8fd73d8bfdd9c590b0165e4c')
+
+# supported boards
+_defconfigs=('A10-OLinuXino-Lime_defconfig'
+             'A10s-OLinuXino-M_defconfig'
+             'A13-OLinuXino_defconfig'
+             'A13-OLinuXinoM_defconfig'
+             'A20-OLinuXino-Lime_defconfig'
+             'A20-OLinuXino-Lime2_defconfig'
+             'A20-OLinuXino-Lime2-eMMC_defconfig'
+             'A20-OLinuXino_MICRO_defconfig'
+             'Bananapi_defconfig'
+             'Bananapro_defconfig'
+             'CHIP_defconfig'
+             'Cubieboard_defconfig'
+             'Cubieboard2_defconfig'
+             'Cubietruck_defconfig'
+             'Linksprite_pcDuino_defconfig'
+             'Linksprite_pcDuino3_defconfig'
+             'Linksprite_pcDuino3_Nano_defconfig'
+             'orangepi_2_defconfig'
+             'orangepi_one_defconfig'
+             'orangepi_pc_defconfig'
+             'orangepi_plus_defconfig')
+
+# Offset at which to install u-boot
+u_boot_with_spl_offset=8192
+
+_nr_targets=0
+for _defconfig in ${_defconfigs[@]}; do
+    _nr_targets=$(expr ${_nr_targets} + 1)
+done
+
+_get_target_name()
+{
+    _defconfig="$1"
+
+    echo ${_defconfig} | \
+        sed 's/_defconfig$//' | \
+        awk '{print tolower($0)}'
+}
+
+_get_target_destdir()
+{
+    _defconfig="$1"
+
+    _target_name="$(_get_target_name ${_defconfig})"
+
+    echo "build/uboot4extlinux-${_target_name}"
+}
+
+_build_uboot_target()
+{
+    _defconfig="$1"
+
+    _destdir="$(_get_target_destdir ${_defconfig})"
+    _target_name="$(_get_target_name ${_defconfig})"
+
+    unset CFLAGS CXXFLAGS LDFLAGS
+
+    local make_vars=( ARCH=arm )
+    make ${make_vars[*]} distclean
+    make ${make_vars[*]} ${_defconfig}
+
+    make_vars+=( EXTRAVERSION=-${pkgrel} )
+    [[ "$CARCH" != armv7h ]] && make_vars+=( CROSS_COMPILE=arm-none-eabi- )
+    echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
+    make ${make_vars[*]}
+
+    echo "==> Installing ${_target_name} to ${_destdir}"
+    install -d ${_destdir}
+    mv -f u-boot-sunxi-with-spl.bin "${_destdir}"
+}
+
+# TODO: We need to fix the timestamps upstream to a valid date
+#       (like the first January 1970at 01:00:00 CET) or something derived
+#       from the release version somehow. Else we have the build log spammed
+#       with errors like that:
+#       make: scripts/Makefile.extrawarn: Timestamp out of range;
+#             substituting 1970-01-01 00:59:59.999999999
+# TODO: While we're at it we could export SOURCE_DATE_SPOCH to try to
+#       make the u-boot package reporducible.
+prepare()
+{
+  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+  find -print0 | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
+}
+
+build()
+{
+  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+
+  _target_nr=0
+  for _defconfig in ${_defconfigs[@]}; do
+      _target_nr=$(expr ${_target_nr} + 1)
+      _target_name="$(_get_target_name ${_defconfig})"
+
+      echo "==> Building ${_target_name} " \
+           "[${_target_nr} of ${_nr_targets} targets]"
+
+      _build_uboot_target "${_defconfig}"
+  done
+}
+
+_check_uboot_target()
+{
+    _defconfig="$1"
+
+    _image="$(_get_target_destdir ${_defconfig})/u-boot-sunxi-with-spl.bin"
+    _image_size="$(du --bytes --apparent-size ${_image} | awk '{print $1}')"
+    _offset="${u_boot_with_spl_offset}"
+
+    _image_end=$(expr ${_image_size} + ${_offset})
+
+    # This test comes from install-uboot4extlinux.sh.in
+    if [ ${_image_end} -gt $(expr 1024 \* 1024) ] ; then
+        echo "Error: ${_image} is too big:"
+        echo "       offset: ${_offset}"
+        echo "       size:   ${_image_size}"
+        echo "       By default, "\
+             "partitioing tools makes the first partition start at 1MiB"
+        echo "       Instaling ${_image} "\
+             "would overwrite that first partition (if it's present)."
+
+        false # Fail the test
+    fi
+}
+
+check()
+{
+  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+
+  _target_nr=0
+  for _defconfig in ${_defconfigs[@]}; do
+      _target_nr=$(expr ${_target_nr} + 1)
+      _target_name="$(_get_target_name ${_defconfig})"
+
+      echo "==> Testing target ${_target_name} " \
+           "[${_target_nr} of ${_nr_targets} targets]"
+      _check_uboot_target "${_defconfig}"
+  done
+
+}
+
+_make_uboot_package()
+{
+    _pkgname="$1"
+
+    if [ -n "${pkgdir}" ] ; then
+        cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+
+        # Install the u-boot binary
+        install -d "${pkgdir}/usr/lib/u-boot/${_pkgname}/"
+        install -Dm644 "build/${_pkgname}/u-boot-sunxi-with-spl.bin" \
+                "${pkgdir}/usr/lib/u-boot/${_pkgname}"
+
+        # Install the u-boot installation script
+        sed < "${srcdir}/install-uboot4extlinux.sh.in" > \
+            "${pkgdir}/usr/lib/u-boot/${_pkgname}/install-uboot4extlinux.sh" \
+              -e "s|@u_boot_with_spl[@]|/usr/lib/u-boot/${_pkgname}/u-boot-sunxi-with-spl.bin|g" \
+              -e "s|@u_boot_with_spl_offset[@]|${u_boot_with_spl_offset}|g"
+
+        chmod +x \
+              "${pkgdir}/usr/lib/u-boot/${_pkgname}/install-uboot4extlinux.sh"
+
+        # Install what is required for the pacman hook
+        install -d "${pkgdir}/usr/share/libalpm/hooks/"
+        sed < "${srcdir}/${pkgbase}.hook.in" > \
+            "${pkgdir}/usr/share/libalpm/hooks/${_pkgname}.hook" \
+            -e "s|@pkgname[@]|${_pkgname}|g"
+
+        install -d "${pkgdir}/usr/share/doc/u-boot/${_pkgname}/"
+        # If we install several uboot4extlinux, we need a way to clearly
+        # separate each postinstall message. To do that we wrapped the
+        # text in an ASCII art square, but doing that is complicated when
+        # using sed as the package name as well as the installation script
+        # path both have variable length.
+        sh "${srcdir}/generate-${pkgbase}-install-text.sh" \
+           "${_pkgname}" \
+           "${pkgbase}" \
+           "/usr/lib/u-boot/${_pkgname}/install-uboot4extlinux.sh" > \
+           "${pkgdir}/usr/share/doc/u-boot/${_pkgname}/install-uboot4extlinux.txt"
+    fi
+}
+
+_make_pkgdesc()
+{
+    board_name="$1"
+    echo "U-Boot with Extlinux support for ${board_name}"
+}
+
+package_uboot4extlinux-sunxi()
+{
+    pkgdesc="Scripts for managing U-Boot installations for computers with Allwinner System On a Chip"
+
+    depends=('uboot-tools')
+
+    # Users are expected to use this as a base for /boot/extlinux/extlinux.conf
+    install -d "${pkgdir}/usr/lib/u-boot/${pkgname}/"
+    install -Dm644 \
+            "${srcdir}/extlinux.conf" \
+            "${pkgdir}/usr/lib/u-boot/${pkgname}/"
+}
+
+package_uboot4extlinux-a10-olinuxino-lime()
+{
+    pkgdesc=$(_make_pkgdesc "A10 OLinuXino Lime")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a10s-olinuxino-m()
+{
+    pkgdesc=$(_make_pkgdesc "A10s OLinuXino Micro")
+
+    replaces=('uboot4extlinux-a10s-olinuxino-micro')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a13-olinuxino()
+{
+    pkgdesc=$(_make_pkgdesc "A13 OLinuXino")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a13-olinuxinom()
+{
+    pkgdesc=$(_make_pkgdesc "uboot4extlinux-a13-olinuxino-micro")
+
+    replaces=('uboot4extlinux-a13-olinuxino-micro')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a20-olinuxino-lime()
+{
+    pkgdesc=$(_make_pkgdesc "A20 OLinuXino Lime")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a20-olinuxino-lime2()
+{
+    pkgdesc=$(_make_pkgdesc "A20 OLinuXino Lime2")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a20-olinuxino-lime2-emmc()
+{
+    pkgdesc=$(_make_pkgdesc "A20 OLinuXino Lime2 with eMMC")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-a20-olinuxino_micro()
+{
+    pkgdesc=$(_make_pkgdesc "uboot-a20-olinuxino-micro")
+
+    replaces=('uboot-a20-olinuxino-micro')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-bananapi()
+{
+    pkgdesc=$(_make_pkgdesc "Banana Pi")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-bananapro()
+{
+    pkgdesc=$(_make_pkgdesc "Banana Pro")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-chip()
+{
+    pkgdesc=$(_make_pkgdesc "C.H.I.P")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-cubieboard()
+{
+    pkgdesc=$(_make_pkgdesc "Cubieboard")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-cubieboard2()
+{
+    pkgdesc=$(_make_pkgdesc "Cubieboard 2")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-cubietruck()
+{
+    pkgdesc=$(_make_pkgdesc "Cubietruck")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-linksprite_pcduino()
+{
+    pkgdesc=$(_make_pkgdesc "uboot4extlinux-pcduino")
+
+    replaces=('uboot4extlinux-pcduino')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-linksprite_pcduino3()
+{
+    pkgdesc=$(_make_pkgdesc "uboot4extlinux-pcduino3")
+
+    replaces=('uboot4extlinux-pcduino3')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-linksprite_pcduino3_nano()
+{
+    pkgdesc=$(_make_pkgdesc "uboot4extlinux-pcduino3-nano")
+
+    replaces=('uboot4extlinux-pcduino3-nano')
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-orangepi_2()
+{
+    pkgdesc=$(_make_pkgdesc "Orange Pi 2")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-orangepi_one()
+{
+    pkgdesc=$(_make_pkgdesc "Orange Pi One")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-orangepi_pc()
+{
+    pkgdesc=$(_make_pkgdesc "Orange Pi PC")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
+
+package_uboot4extlinux-orangepi_plus()
+{
+    pkgdesc=$(_make_pkgdesc "Orange Pi Plus")
+
+    # util-linux is needed for blkid for install-uboot4extlinux.sh
+    depends=("${pkgbase}" 'util-linux')
+
+    _make_uboot_package "${pkgname}"
+}
diff --git a/libre-testing/uboot4extlinux-sunxi/TODO.txt b/libre-testing/uboot4extlinux-sunxi/TODO.txt
new file mode 100644
index 000000000..1d8e08c63
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/TODO.txt
@@ -0,0 +1,39 @@
++------+
+| TODO |
++------+
+- We could add automatic updates. It would require a bit of
+  work:
+  - u-boot has code to detect images. We could write a tool that
+    reuses that code to detect Allwinner eGON images.
+    See the 0001-Add-tool-to-dump-sunxi-images.patch for inspiration
+    on how to do that.
+  - Once done that tool could then be leveraged for detecting
+    u-boot installations and updating the u-boot images with a
+    pacman hook for devices that are booted.
+  - We could also check the devicetree to make sure we are
+    running on the right device.
+  - For chroots we could somehow detect that we are in a chroot
+    and find if there is an underlying block device, and upgrade
+    u-boot there.
+  - In any case we need to be careful not to break other computers:
+    some x86 laptops have eMMC too, and most of the time theses
+    eMMC also contains the BIOS and/or UEFI, so we don't want to
+    erase that. We also don't want to erase the laptop filesytems
+    either.
+- We need to build some infrastructure for users to report working
+  boards and mention it here and on the wiki for adding official
+  support for boards. We could for instance do something as simple
+  as possible like open a new bug tracker specially for that and
+  just reference that in the wiki for instance.
+- We also need to make dtb fragment work in u-boot to support more
+  use cases and possibly also package popular dtb fragment for the
+  beaglebone black.
+- In addition we could then leverage that to build an image for
+  the beaglebone black (or other boards) for flashing Libreboot.
+  This way Libreboot would benefit from an FSDG compatible image
+  that is also maintained by an upstream distribution.
+- We could also look maing an u-boot package that has UEFI compatibility
+  and also bundle GRUB with it. This way we could simplify the installation
+  instructions by leverage users knowledge about GRUB and also potentially
+  investigate if we could leverage the UEFI standard for easily upgrading
+  that u-boot+UEFI+grub image.
diff --git a/libre-testing/uboot4extlinux-sunxi/extlinux.conf b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
new file mode 100644
index 000000000..4cc4b1b18
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
@@ -0,0 +1,21 @@
+menu title Welcome to U-Boot with Extlinux support!
+
+timeout 50
+
+label Parabola GNU/Linux-libre, linux-libre kernel
+	kernel /boot/vmlinuz-linux-libre
+	initrd /boot/initramfs-linux-libre.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	fdtdir /boot/dtbs/linux-libre
+
+label Parabola GNU/Linux-libre, linux-libre-lts kernel
+	kernel /boot/vmlinuz-linux-libre-lts
+	initrd /boot/initramfs-linux-libre-lts.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	fdtdir /boot/dtbs/linux-libre-lts
+
+label Parabola GNU/Linux-libre, linux-libre-pck kernel
+	kernel /boot/vmlinuz-linux-libre-pck
+	initrd /boot/initramfs-linux-libre-pck.img
+	append console=ttyS0,115200 root=/dev/mmcblk0p1 rw rootwait
+	fdtdir /boot/dtbs/linux-libre-pck
diff --git a/libre-testing/uboot4extlinux-sunxi/generate-uboot4extlinux-sunxi-install-text.sh b/libre-testing/uboot4extlinux-sunxi/generate-uboot4extlinux-sunxi-install-text.sh
new file mode 100644
index 000000000..e8c9c29a9
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/generate-uboot4extlinux-sunxi-install-text.sh
@@ -0,0 +1,141 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2020 Denis 'GNUtoo' Carikli
+
+line_length=81
+
+printchar()
+{
+    char="$1"
+    nr_chars="$2"
+
+    if [ -z "${nr_chars}" ] ; then
+        echo -n "${char}"
+    else
+        i=0
+        while [ $i -lt ${nr_chars} ] ; do
+            echo -n "${char}"
+            i=$(expr $i + 1)
+        done
+    fi
+}
+
+print_separation_line()
+{
+    echo -n "+"
+    printchar "-" $(expr ${line_length} - 2)
+    echo  "+"
+}
+
+strlen()
+{
+    echo $(expr $(echo "$1" | wc -c) - 1)
+}
+
+print_header()
+{
+    pkgname="$1"
+
+    # ${line_length}
+    # - '| '
+    # - ${pkgname}
+    # - ' '
+    # - 'installation instructions:'
+    # - ' |'
+    extra_spaces=$(expr ${line_length} - 2 - $(strlen "${pkgname}") - 1)
+    extra_spaces=$(expr ${extra_spaces} - \
+                $(strlen "installation instructions:") - 2)
+
+    print_separation_line
+    echo -n "| "
+    echo -n "${pkgname} installation instructions:"
+    printchar " " "${extra_spaces}"
+    echo " |"
+    print_separation_line
+}
+
+print_line()
+{
+    line="$1"
+
+    # ${line_length} - '| ' - ${line} -  ' |'
+    extra_spaces=$(expr ${line_length} - 2 - $(strlen "${line}") - 2)
+    echo -n '| '
+    echo -n "${line}"
+    printchar " " "${extra_spaces}"
+    echo ' |'
+}
+
+print_text()
+{
+    for line in "$@" ; do
+        print_line "${line}"
+    done
+}
+
+print_introduction()
+{
+    print_text \
+        "To boot with u-boot you will need to do two things:" \
+        "- First you will need to install u-boot to the storage device (like" \
+        "  a microSD) you will be booting from. You can consult the Parabola" \
+        "  installation instructions to know which storage devices are" \
+        "  supported." \
+        "- Then you will need to read and potentially modify the" \
+        "  /boot/extlinux/extlinux.conf configuration file to tell u-boot" \
+        "  from which kernel to boot, and various other settings related to" \
+        "  booting (like LVM or disk encryption settings)."
+}
+
+print_uboot_install_instructions()
+{
+    pkgname="$1"
+    install_script="$2"
+
+    print_text \
+           "To install or upgrade u-boot you can use similar commands:" \
+           "    cd $(dirname ${script})" \
+           "    sudo ./$(basename ${script}) <path/to/block-device>"
+
+    print_line ""
+
+    print_text \
+       "For instance if the microSD you (will) boot from is available at" \
+       "/dev/mmcblk0 you can use the following commands:" \
+           "    cd $(dirname ${script})" \
+           "    sudo ./$(basename ${script}) /dev/mmcblk0"
+
+    print_line ""
+
+    print_text \
+       "Instead if the microSD is available at /dev/sdb you can use the" \
+       "following commands:" \
+           "    cd $(dirname ${script})" \
+           "    sudo ./$(basename ${script}) /dev/sdb"
+}
+
+print_extlinux_config_remainder()
+{
+    pkgbase="$1"
+
+    print_text \
+       "When this is done you'll need to create and/or modify the" \
+       "/boot/extlinux/extlinux.conf configuration file."
+    print_line ""
+
+    print_text \
+        "There is an example file for that at" \
+        "/usr/lib/u-boot/${pkgbase}/extlinux.conf"
+}
+
+pkgname="$1"
+pkgbase="$2"
+script="$3"
+
+print_header "${pkgname}"
+print_introduction
+print_line " "
+print_uboot_install_instructions "${pkgname}" "${script}"
+print_line " "
+print_extlinux_config_remainder "${pkgbase}"
+print_separation_line
diff --git a/libre-testing/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in b/libre-testing/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in
new file mode 100644
index 000000000..1c744f313
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in
@@ -0,0 +1,88 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2020 Denis 'GNUtoo' Carikli
+
+progname="install-uboot4extlinux.sh"
+u_boot_with_spl="@u_boot_with_spl@"
+u_boot_with_spl_offset=@u_boot_with_spl_offset@
+
+usage()
+{
+	echo "Usage: ${progname} [INSTALL_DEVICE]"
+}
+
+install_image()
+{
+	install_device="$1"
+	offset="$2"
+	image="$3"
+
+	# We need root permissions for now:
+	# - blkid is used to bypass caching and it needs root access
+	if [ "$(id -u)" != 0 ] ; then
+		echo "Error: This script needs to be run as root"
+		exit 1
+	fi
+
+	# We only support MBR for now
+	# It will also catch errors like /dev/sdb1 and mmcbk0p1 as they
+	# don't have the PTTYPE tag
+	PTTYPE="$(blkid --probe --match-tag PTTYPE ${install_device} | \
+		  awk '{print $2}' | sed 's#^PTTYPE="##' | sed 's#"$##')"
+	if [ -z "${PTTYPE}" ] ; then
+		echo "Error: Could not find an (MBR) formating inside " \
+		     "${install_device}"
+		echo "       Possible causes:"
+		echo "       - Maybe {instal_device} is a partition"
+		echo "       - or Maybe it's completelyor unformated"
+		exit 1
+	elif [ "${PTTYPE}" != "dos" ] ; then
+		echo "Error: ${install_device} is not in MBR format"
+		echo "       Currently, only the MBR format is supported"
+		exit 1
+	fi
+
+	# Check if offset > MBR partition table part end
+	if [ ${offset} -lt 512 ] ; then
+	    echo "Error: The offset (${offset}) is < 512"
+	    echo "       offsets < 512 aren't supported (yet)"
+	    exit 1
+	fi
+
+	# Get the image size
+	image_size="$(du --bytes --apparent-size ${image} | awk '{print $1}')"
+
+	# With MBR, most partitioning tools leave makes the first partition
+	# start at 1MiB. So we need to check if the bootloader doesn't end
+	# up overwriting the first partition.
+	if [ $(expr ${image_size} + ${offset}) -gt $(expr 1024 \* 1024) ] ; then
+		echo "Error: ${image} is too big:"
+		echo "       offset: ${offset}"
+		echo "       size:   ${image_size}"
+		echo "       By default, "\
+		     "partitioing tools makes the first partition start at 1MiB"
+		echo "       Instaling ${images} "\
+		     "would overwrite that first partition (if it's present)."
+		echo "       Please contact the Parabola developers " \
+		     "so they could fix that issue"
+		exit 1
+	fi
+
+	# Copies with with a block size of 1 can be quite slow in practice
+	if [ "$(expr ${offset} % 512)" = 0 ] ; then
+		dd conv=notrunc "if=${image}" "of=${install_device}" \
+		   bs=512 "seek=$(expr ${offset} / 512)"
+	else
+		echo "Warning: slow copy"
+		dd conv=notrunc "if=${image}" "of=${install_device}" \
+		   bs=1 "seek=${offset}"
+	fi
+
+	sync "${install_device}"
+}
+
+if [ $# -ne 1 ] ; then
+    usage
+else
+    install_image "$1" "${u_boot_with_spl_offset}" "${u_boot_with_spl}"
+fi
diff --git a/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.hook.in b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.hook.in
new file mode 100644
index 000000000..8cfa27bcc
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.hook.in
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Package
+Operation = Install
+Operation = Upgrade
+Target = @pkgname@
+
+[Action]
+Description = Test
+When = PostTransaction
+Exec = /usr/bin/cat /usr/share/doc/u-boot/@pkgname@/install-uboot4extlinux.txt
+NeedsTargets
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index 513ed74e3..a2b8ca12c 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -1,9 +1,9 @@
 # U-Boot: sunXi
-# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-# Maintainer: Parabola hackers <dev@lists.parabola.nu>
+# Maintainers: Parabola hackers <dev@lists.parabola.nu>
 
 # To add a new board (that uses an Allwinner System On a Chip) you need:
 # - The package name. Example: uboot4extlinux-a20-olinuxino_micro
@@ -32,7 +32,7 @@
 # point to it when relevant. Examples of that are available for other
 # boards in the ARM installation guide.
 
-_upstream_name=u-boot-libre
+_pkgbase=u-boot-libre
 pkgbase=uboot4extlinux-sunxi
 pkgname=("${pkgbase}"
          'uboot4extlinux-a10-olinuxino-lime'
@@ -57,11 +57,24 @@ pkgname=("${pkgbase}"
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
 
-_uboot_ver=2022.04 # version of the upstream u-boot source code
-_ubootlibre_rev=r1 # revision of the u-boot-libre deblob script
-
-pkgver="${_uboot_ver}"
-pkgrel="${_ubootlibre_rev}.parabola3"
+# We have a ${pkgver}-${pkgrel} that looks like that:
+# '2021.07-r1.parabola3' and all the individual components are needed:
+# - '2021.07' corresponds to the upstream u-boot version. It is needed
+#   to know which u-boot version source code is used.
+# - 'r1' corresponds to the u-boot-libre revision. Without it it would
+#   be impossible to fix bugs inside the u-boot-libre deblob script.
+# - .parabola3 is the Parabola package revision. Without it it would be
+#   impossible to fix bugs inside this PKGBUILD.
+# As for the '-r1', it cannot go inside pkgver, else we end up with an
+# error like that when running makepkg:
+# ==> ERROR: pkgver is not allowed to contain colons, forward slashes,
+#     hyphens or whitespace.
+# so it was moved in pkgrel.
+_pkgver=2021.07
+_pkgrel=r1
+
+pkgver="${_pkgver}"
+pkgrel="${_pkgrel}.parabola3"
 
 arch=('armv7h' 'i686' 'x86_64')
 url="https://libreboot.org/docs/maintain/#resourcesscriptsbuildreleaseu-boot-libre"
@@ -71,12 +84,12 @@ makedepends_i686+=('arm-none-eabi-gcc')
 makedepends_ppc64le+=('arm-none-eabi-gcc')
 makedepends_x86_64+=('arm-none-eabi-gcc')
 
-_mirror="https://mirrors.mit.edu/libreboot/" # use a mirror per libreboot's request
-source=("${_mirror}/${_upstream_name}/${_uboot_ver}-${_ubootlibre_rev}/${_upstream_name}-${_uboot_ver}-${_ubootlibre_rev}.tar.xz")
-source+=('extlinux.conf'
-        "${pkgbase}.hook.in"
-        'install-uboot4extlinux.sh.in'
-        "generate-${pkgbase}-install-text.sh")
+# According to the Libreboot maintainer, we are supposed to use
+# any of the mirrors in https://libreboot.org/download.html#https
+# and not use the rsync server. The rsync server is only supposed
+# to be used by mirrors as it has limited bandwith.
+_mirror="https://mirrors.mit.edu/libreboot/"
+source=("${_mirror}/${_pkgbase}/${_pkgver}-${_pkgrel}/${_pkgbase}-${_pkgver}-${_pkgrel}.tar")
 
 # TODO: this checksum doesn't correspond to the one in
 #       tests/u-boot-libre.sha512. This means that the tarball is not
@@ -95,13 +108,17 @@ source+=('extlinux.conf'
 #       code, so while there is a valid license, we might lack
 #       corresponding source code if it's really some code. The debian
 #       commits might have more information about it.
-sha512sums=('b816667988210c4f5e0e219fcf633fe0c599ced74568a2924afc8df14bede52ce0c9615ff27eae3ecf194d41a87d04231f099c90beece18028ee5890a3911669')
-sha512sums+=('dcbcbc8d196c7dd7db1a8a30dfa8c9ece5d241580bdf593df5fa2de527f0dfea2bb76ff9bfe49fb1e9d631bd1e4b95c828a41cfb38dc2ddc9553e18a54a521f0'
-             '766b28c45218746672d3e802c16f2c1283d708b43edf0a42cb569c1cfa6d6d3f318d5da91efcc832303dcc2175ee23528d15891010c187dea4c6828e82596be3'
-             '1ecb7b932bb0b097cac2cdfabbf7faa1601a556b49782f68109be07e49bff62d4515d6492ad1c72f471cdc7b4e1c2d8750e3494fcb0fc93108e6e5bd4e82aedb'
-             'b0e8b0ec7f742778ffed486cf529d56d550db48354a4251867078fda8e5a28c8938f6c005225042744c1117a6abb3843e632234b8fd73d8bfdd9c590b0165e4c')
+sha512sums=('4fd4cb762efd6b3e1eede883ee44cbf16f787de7f9bd8d6f9a98d69a22fd75519cce4b9ff713b205d34854597d2f9d6053dabc6097e55cb5be7c7ce71dae2ef6')
+
+source+=('extlinux.conf'
+        "${pkgbase}.hook.in"
+        'install-uboot4extlinux.sh.in'
+        "generate-${pkgbase}-install-text.sh")
+sha512sums+=('SKIP'
+             'SKIP'
+             'SKIP'
+             'SKIP')
 
-# supported boards
 _defconfigs=('A10-OLinuXino-Lime_defconfig'
              'A10s-OLinuXino-M_defconfig'
              'A13-OLinuXino_defconfig'
@@ -127,6 +144,11 @@ _defconfigs=('A10-OLinuXino-Lime_defconfig'
 # Offset at which to install u-boot
 u_boot_with_spl_offset=8192
 
+case "$CARCH" in
+    armv7h)              ARCH=arm;;
+    i686|ppc64le|x86_64) ARCH=arm;CROSS_COMPILE=arm-none-eabi-;;
+esac
+
 _nr_targets=0
 for _defconfig in ${_defconfigs[@]}; do
     _nr_targets=$(expr ${_nr_targets} + 1)
@@ -159,18 +181,22 @@ _build_uboot_target()
 
     unset CFLAGS CXXFLAGS LDFLAGS
 
-    local make_vars=( ARCH=arm )
-    make ${make_vars[*]} distclean
-    make ${make_vars[*]} ${_defconfig}
+    make "ARCH=${ARCH}" distclean
+    make "ARCH=${ARCH}" ${_defconfig}
 
-    make_vars+=( EXTRAVERSION=-${pkgrel} )
-    [[ "$CARCH" != armv7h ]] && make_vars+=( CROSS_COMPILE=arm-none-eabi- )
     echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
-    make ${make_vars[*]}
+
+    if [ "$CARCH" = "armv7h" ]; then
+        make "ARCH=${ARCH}" EXTRAVERSION=-${pkgrel}
+    else
+        make "ARCH=${ARCH}" "CROSS_COMPILE=${CROSS_COMPILE}" \
+             EXTRAVERSION=-${pkgrel}
+    fi
 
     echo "==> Installing ${_target_name} to ${_destdir}"
     install -d ${_destdir}
     mv -f u-boot-sunxi-with-spl.bin "${_destdir}"
+
 }
 
 # TODO: We need to fix the timestamps upstream to a valid date
@@ -183,13 +209,13 @@ _build_uboot_target()
 #       make the u-boot package reporducible.
 prepare()
 {
-  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+  cd "${_pkgbase}-${_pkgver}-${_pkgrel}"
   find -print0 | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
 }
 
 build()
 {
-  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+  cd "${_pkgbase}-${_pkgver}-${_pkgrel}"
 
   _target_nr=0
   for _defconfig in ${_defconfigs[@]}; do
@@ -229,7 +255,7 @@ _check_uboot_target()
 
 check()
 {
-  cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+  cd "${_pkgbase}-${_pkgver}-${_pkgrel}"
 
   _target_nr=0
   for _defconfig in ${_defconfigs[@]}; do
@@ -248,7 +274,7 @@ _make_uboot_package()
     _pkgname="$1"
 
     if [ -n "${pkgdir}" ] ; then
-        cd "${srcdir}"/u-boot-v${_uboot_ver}-${_ubootlibre_rev}
+        cd "${_pkgbase}-${_pkgver}-${_pkgrel}"
 
         # Install the u-boot binary
         install -d "${pkgdir}/usr/lib/u-boot/${_pkgname}/"