Merge branch 'meta/allpatches' into jookia_allpatches

Signed-off-by: John Watts <contact@jookia.org>

Author: Jookia

Makefile

@@ -4,6 +4,7 @@ VERSION = 2024
 PATCHLEVEL = 07
 SUBLEVEL =
 EXTRAVERSION = -rc3
+PATCHESVERSION = TODO
 NAME =
 
 # *DOCUMENTATION*
@@ -458,7 +459,7 @@ KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
 
 # Read UBOOTRELEASE from include/config/uboot.release (if it exists)
 UBOOTRELEASE = $(shell cat include/config/uboot.release 2> /dev/null)
-UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
+UBOOTVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)$(PATCHESVERSION)
 
 export VERSION PATCHLEVEL SUBLEVEL UBOOTRELEASE UBOOTVERSION
 export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR

README README.mdREADME renamed to README.md

@@ -1,3 +1,47 @@
+Jookia's U-Boot
+---------------
+
+This is my branch of U-Boot with features I've either developed or use in my projects.
+
+Allwinner D1 and T113 patches:
+- [sunxi: video: Support LCD and HDMI output on H6/D1](https://lore.kernel.org/r/20240420-d1_de2-v1-0-297efca674ba@jookia.org) (branch b4/d1_de2)
+- [pwm: sunxi: Add support Allwinner D1 PWM](https://lore.kernel.org/r/20240518-pwm_d1-v1-0-311fc5fe2248@jookia.org) (branch b4/pwm_d1)
+- [Support SPI NAND booting on the T113](https://lore.kernel.org/r/20240411-spinand-v1-0-62d31bb188e8@jookia.org) (branch b4/spinand)
+- [sunxi: Support UART1 and UART2 on the T113](https://lore.kernel.org/r/20240411-t113serial-v1-0-41ff858a1235@jookia.org) (branch b4/t113serial)
+
+Platform independent patches:
+- [boot: Pass baud rate to stdout](https://lore.kernel.org/r/20240411-stdout-v1-1-66ebe5bb152f@jookia.org) (branch b4/stdout)
+
+Cleanup patches:
+- [ubi: Depend on MTD](https://lore.kernel.org/r/20240411-mtd-v1-1-fe300f6ab657@jookia.org) (branch b4/mtd)
+- [spi: Various Kconfig fixes](https://lore.kernel.org/r/20240427-spikconfig-v1-0-8a54772522f4@jookia.org) (branch b4/spikconfig)
+
+Third party patches:
+- [sunxi, usb: UDC/DM gadget model support](https://lore.kernel.org/all/20230608195631.55364-1-CFSworks@gmail.com/) (branch patches/musb-new)
+
+This branch tracks mainline U-Boot and performs small fixups on the patches. To
+see a list of commits from this branch only use this command:
+
+```
+git log --left-only --oneline jookia_allpatches...master
+```
+
+I regularly sign my Git commits with my hardware SSH key, if you would like to
+verify them run this and subtitute TAG or COMMIT:
+
+```
+git -c gpg.ssh.allowedSignersFile=jookia/allowed_signers verify-tag TAG
+git -c gpg.ssh.allowedSignersFile=jookia/allowed_signers log --oneline --show-signature COMMIT
+```
+
+My key fingerprint is ```SHA256:/gEvgms/9HpbgpcH+K7O4GYXmqkP7siJx9zHeEWRZTg```.
+
+Please verify it by comparing it to my website: https://www.jookia.org/wiki/Keys
+
+Mainline README
+---------------
+
+```
 # SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000 - 2013
@@ -2651,3 +2695,4 @@ The U-Boot projects depends on contributions from the user community.
 If you want to participate, please, have a look at the 'General'
 section of https://docs.u-boot.org/en/latest/develop/index.html
 where we describe coding standards and the patch submission process.
+```

jookia/allowed_signers

@@ -0,0 +1 @@
+jookia sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAID7OzA3dl0YNrkRPXGldZTzz3rtFcyBvXz661ZmMgIS3AAAABHNzaDo= jookia@titan

jookia/create_release.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# SPDX-License-Identifier: CC0
+# Copyright 2025 John Watts <contact@jookia.org>
+
+set -e
+set -x
+TODAY="$(date +"%Y%m%d")"
+FILE=uboot-allpatches-$TODAY.tar.bz2
+sed -i "s/\(PATCHESVERSION = \).*/\1-allpatches$TODAY/g" Makefile
+git commit -m "Bump PATCHESVERSION to -allpatches$TODAY" -s -S Makefile
+git tag -s -m "Release $TODAY" allpatches/$TODAY
+mkdir -p release/
+git archive --format=tar --prefix=uboot-allpatches-$TODAY/ HEAD | \
+	bzip2 > release/$FILE
+cp jookia/allowed_signers release
+ssh-keygen -Y sign -f ~/.ssh/id_ed25519_sk_solo.pub -n file release/$FILE
+(cd release; sha256sum * > sha256sums)
+git push mine jookia_allpatches allpatches/$TODAY
+cat <<EOF >release/GITHUB
+(add some comment here)
+
+How to check the integrity and authenticity of these files:
+
+\`\`\`
+sha256sum -c sha256sums
+ssh-keygen -Y verify -f allowed_signers -I jookia -n file -s $FILE.sig < $FILE
+\`\`\`
+
+Make sure to check the key fingerprint against my website: https://www.jookia.org/wiki/Keys
+EOF