u-boot: update Amlogic patches for 2022.10

projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch

@@ -1,7 +1,7 @@
-From 86edbd0797e43d4d1ac06575011e60170cb22440 Mon Sep 17 00:00:00 2001
+From 95ed57b0ca24cde1d7547878101c62f552cb1160 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 13 Nov 2020 02:09:36 +0000
-Subject: [PATCH 01/15] LOCAL: configs: meson64: prevent stdout/stderr on
+Subject: [PATCH 01/16] LOCAL: configs: meson64: prevent stdout/stderr on
  videoconsole
 
 Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr
@@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/configs/meson64.h b/include/configs/meson64.h
-index 196e58ed9a..3b8b079e2a 100644
+index 40803ee9da..05b1fcb9fd 100644
 --- a/include/configs/meson64.h
 +++ b/include/configs/meson64.h
 @@ -18,7 +18,7 @@

projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch

@@ -1,7 +1,7 @@
-From 6a0fbd77c0151ae66962425bb6726160301bfeb5 Mon Sep 17 00:00:00 2001
+From d16384b766e1704470f678589e01d288fbb94960 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 22 Apr 2021 06:52:50 +0000
-Subject: [PATCH 02/15] LOCAL: configs: meson64: remove /amlogic so fdtdir
+Subject: [PATCH 02/16] LOCAL: configs: meson64: remove /amlogic so fdtdir
  finds LE boot files
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 02/15] LOCAL: configs: meson64: remove /amlogic so fdtdir
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/configs/meson64.h b/include/configs/meson64.h
-index 3b8b079e2a..7d83ef37a3 100644
+index 05b1fcb9fd..c4af944382 100644
 --- a/include/configs/meson64.h
 +++ b/include/configs/meson64.h
-@@ -94,7 +94,7 @@
+@@ -89,7 +89,7 @@
  	"pxefile_addr_r=0x01080000\0" \
  	"fdtoverlay_addr_r=0x01000000\0" \
  	"ramdisk_addr_r=0x13000000\0" \

projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch

@@ -1,7 +1,7 @@
-From 8605348fc36d4079795c05acf9047a9b44e20454 Mon Sep 17 00:00:00 2001
+From a9fc1d56916fbcf4e00a1dd7543c9f53d697477a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 3 Aug 2021 18:42:55 +0000
-Subject: [PATCH 03/15] LOCAL: board: amlogic: odroid-n2: remove /amlogic/
+Subject: [PATCH 03/16] LOCAL: board: amlogic: odroid-n2: remove /amlogic/
  prefix for dtb path
 
 Remove the /amlogic/ prefix to align with current LE dtb locations.

projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch

@@ -0,0 +1,38 @@
+From 7d8355053316d3f760a5ac14156e77e27aa5f6d5 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 25 Oct 2022 14:24:21 +0000
+Subject: [PATCH 04/16] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset
+ properties
+
+The sync of device-tree/bindings in 11a48a5a18c6 ("Linux 5.6-rc2") causes
+Ethernet to break on some GXBB boards; the PHY seems to need proper reset
+timing to function in u-boot and Linux. Re-add the old PHY reset binding
+for dwmac until we support new bindings in the PHY node. This borrows the
+same fix applied to the Odroid C2 board [0].
+
+[0] https://lists.denx.de/pipermail/u-boot/2021-April/446658.html
+
+Fixes: dd5f2351e99a ("arm64: dts: meson: sync dt and bindings from v5.6-rc2")
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi
+index c35158d7e9..2a245bbe7f 100644
+--- a/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi
++++ b/arch/arm/dts/meson-gxbb-nanopi-k2-u-boot.dtsi
+@@ -5,3 +5,10 @@
+  */
+ 
+ #include "meson-gx-u-boot.dtsi"
++
++&ethmac {
++	snps,reset-gpio = <&gpio GPIOZ_14 0>;
++	snps,reset-delays-us = <0 10000 1000000>;
++	snps,reset-active-low;
++};
++
+-- 
+2.17.1
+

projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch

@@ -1,7 +1,7 @@
-From 3c9aed114551a975e42d68feea7689710644f038 Mon Sep 17 00:00:00 2001
+From f72090a5d057a18fa8bceec0400c212012f56126 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 20 Apr 2021 05:19:43 +0000
-Subject: [PATCH 04/15] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
+Subject: [PATCH 05/16] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
  5.19
 
 Import the WeTek common dtsi and Hub/Play2 device-trees.
@@ -22,7 +22,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm/dts/meson-gxbb-wetek.dtsi
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index a7e0d9f6c0..05aac1b447 100644
+index 965895bc2a..4a1ac8ecaf 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -181,6 +181,8 @@ dtb-$(CONFIG_ARCH_MESON) += \

projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch

@@ -1,7 +1,7 @@
-From 8ddf1b4cee0fb1a804b7cc82a7a1c69019a8e18f Mon Sep 17 00:00:00 2001
+From 4df4197e1eb7e257d0c4dda60a7ff427fbd47c6f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 20 Apr 2021 05:29:19 +0000
-Subject: [PATCH 05/15] WIP: ARM: dts: use snps,reset on WeTek devices to fix
+Subject: [PATCH 06/16] WIP: ARM: dts: use snps,reset on WeTek devices to fix
  Ethernet
 
 The sync of the device tree and dt-bindings from Linux v5.6-rc2

projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch

@@ -1,7 +1,7 @@
-From 6722c7734b2f6fa8a7e6a655d792ae3d1ca891d6 Mon Sep 17 00:00:00 2001
+From cec8965a83baea925ac82ca0be5dac3cc1823915 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 22 Apr 2021 05:45:29 +0000
-Subject: [PATCH 06/15] WIP: boards: amlogic: add board files for wetek-gxbb
+Subject: [PATCH 07/16] WIP: boards: amlogic: add board files for wetek-gxbb
  devices
 
 These support the WeTek Hub and Play2 devices.

projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch

@@ -1,12 +1,12 @@
-From c6aa036d08a918583aea24c24cab85555f057006 Mon Sep 17 00:00:00 2001
+From 2c34fb2dd9aabc081f3fd502e5ef90581bf5a34e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 27 Feb 2021 06:03:00 +0000
-Subject: [PATCH 07/15] WIP: boards: amlogic: add WeTek Hub defconfig
+Subject: [PATCH 08/16] WIP: boards: amlogic: add WeTek Hub defconfig
 
 Signed-of-by: Christian Hewitt <christianshewitt@gmail.com>
 ---
- configs/wetek-hub_defconfig | 71 +++++++++++++++++++++++++++++++++++++
+ configs/wetek-hub_defconfig | 69 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 71 insertions(+)
+ 1 file changed, 69 insertions(+)
  create mode 100644 configs/wetek-hub_defconfig
 
 diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig
@@ -14,7 +14,7 @@ new file mode 100644
 index 0000000000..73fd7c4211
 --- /dev/null
 +++ b/configs/wetek-hub_defconfig
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,69 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_BOARD="wetek-gxbb"
 +CONFIG_ARCH_MESON=y
@@ -28,8 +28,6 @@ index 0000000000..73fd7c4211
 +CONFIG_IDENT_STRING=" wetek-hub"
 +CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-hub"
 +CONFIG_DEBUG_UART=y
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
 +CONFIG_OF_BOARD_SETUP=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_MISC_INIT_R=y

projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch

@@ -1,12 +1,12 @@
-From eb94f8ab5bbfc7acb86bf4ed4347f4661bddce05 Mon Sep 17 00:00:00 2001
+From 5836c75e7ddbc2f3d73cca26679da7a80af5e45b Mon Sep 17 00:00:00 2001
 From: chewitt <christianshewitt@gmail.com>
 Date: Sat, 27 Feb 2021 06:04:00 +0000
-Subject: [PATCH 08/15] WIP: boards: amlogic: add WeTek Play2 defconfig
+Subject: [PATCH 09/16] WIP: boards: amlogic: add WeTek Play2 defconfig
 
 Signed-off-by: Christian Hewittt <christianshewitt@gmail.com>
 ---
- configs/wetek-play2_defconfig | 71 +++++++++++++++++++++++++++++++++++
+ configs/wetek-play2_defconfig | 69 +++++++++++++++++++++++++++++++++++
- 1 file changed, 71 insertions(+)
+ 1 file changed, 69 insertions(+)
  create mode 100644 configs/wetek-play2_defconfig
 
 diff --git a/configs/wetek-play2_defconfig b/configs/wetek-play2_defconfig
@@ -14,7 +14,7 @@ new file mode 100644
 index 0000000000..f218ba0e0e
 --- /dev/null
 +++ b/configs/wetek-play2_defconfig
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,69 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_BOARD="wetek-gxbb"
 +CONFIG_ARCH_MESON=y
@@ -28,8 +28,6 @@ index 0000000000..f218ba0e0e
 +CONFIG_IDENT_STRING=" wetek-play2"
 +CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-play2"
 +CONFIG_DEBUG_UART=y
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
 +CONFIG_OF_BOARD_SETUP=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_MISC_INIT_R=y

projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-video-to-WeTek-Hub.patch

@@ -1,7 +1,7 @@
-From 9bc2096ac8a3ffd6bbe12a4369654f42f4c93690 Mon Sep 17 00:00:00 2001
+From bbe4c8304f9bd6084159d5180acaef0302b1d5bc Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 29 Jul 2022 09:43:33 +0000
-Subject: [PATCH 15/15] WIP: boards: amlogic: add video to WeTek Hub
+Subject: [PATCH 10/16] WIP: boards: amlogic: add video to WeTek Hub
 
 ---
  configs/wetek-hub_defconfig | 14 +++++++-------

projects/Amlogic/patches/u-boot/u-boot-0011-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch

@@ -1,7 +1,7 @@
-From c808f39045b742949d3e1a11666eebb3a08dcfd8 Mon Sep 17 00:00:00 2001
+From 91edd965aae7112ff260437c9f5154b574d79101 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 15 Jan 2022 06:17:23 +0000
-Subject: [PATCH 09/15] WIP: ARM: dts: add support for Radxa Zero2
+Subject: [PATCH 11/16] WIP: ARM: dts: add support for Radxa Zero2
 
 Import the initial dts (WIP) from chewitt/amlogic-5.16.y
 
@@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2.dts
 
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 05aac1b447..abe3a67420 100644
+index 4a1ac8ecaf..926ae0aae4 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_MESON) += \

projects/Amlogic/patches/u-boot/u-boot-0012-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch

@@ -1,22 +1,22 @@
-From 952b367deb82ab8f4dc48f6170562e134389d31f Mon Sep 17 00:00:00 2001
+From 9b4e8cd6063a2dca9b59796ae282540537ddfeec Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 15 Jan 2022 06:23:29 +0000
-Subject: [PATCH 10/15] WIP: boards: amlogic: add Radxa Zero2 defconfig
+Subject: [PATCH 12/16] WIP: boards: amlogic: add Radxa Zero2 defconfig
 
 Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip.
 
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 ---
  board/amlogic/w400/MAINTAINERS |  1 +
- configs/radxa-zero2_defconfig  | 74 ++++++++++++++++++++++++++++++++++
+ configs/radxa-zero2_defconfig  | 72 ++++++++++++++++++++++++++++++++++
- 2 files changed, 75 insertions(+)
+ 2 files changed, 73 insertions(+)
  create mode 100644 configs/radxa-zero2_defconfig
 
 diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
-index 991590d9f2..8587f67b46 100644
+index 96ccda2001..caad41577d 100644
 --- a/board/amlogic/w400/MAINTAINERS
 +++ b/board/amlogic/w400/MAINTAINERS
-@@ -3,4 +3,5 @@ M:	Neil Armstrong <narmstrong@baylibre.com>
+@@ -3,4 +3,5 @@ M:	Neil Armstrong <neil.armstrong@linaro.org>
  S:	Maintained
  L:	u-boot-amlogic@groups.io
  F:	board/amlogic/w400/
@@ -27,7 +27,7 @@ new file mode 100644
 index 0000000000..e9bd2a4f13
 --- /dev/null
 +++ b/configs/radxa-zero2_defconfig
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,72 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_MESON=y
 +CONFIG_SYS_TEXT_BASE=0x01000000
@@ -41,8 +41,6 @@ index 0000000000..e9bd2a4f13
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_IDENT_STRING=" radxa-zero2"
 +CONFIG_DEBUG_UART=y
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
 +CONFIG_OF_BOARD_SETUP=y
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_MISC_INIT_R=y

projects/Amlogic/patches/u-boot/u-boot-0013-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch

@@ -1,7 +1,7 @@
-From 00abe0faee0cc8a58615dafc609cb54edcf74989 Mon Sep 17 00:00:00 2001
+From 86d32fb1182ab7cc29e2673329a696d8e27011de Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 15 Jan 2022 06:35:47 +0000
-Subject: [PATCH 11/15] WIP: doc: boards: amlogic: update for Radxa Zero2
+Subject: [PATCH 13/16] WIP: doc: boards: amlogic: update for Radxa Zero2
 
 Add documentation bits for the Radxa Zero2
 
@@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  rename doc/board/amlogic/{radxa-zero.rst => radxa-zero2.rst} (76%)
 
 diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
-index 8587f67b46..d8f9d3bded 100644
+index caad41577d..6e1ef9b8b8 100644
 --- a/board/amlogic/w400/MAINTAINERS
 +++ b/board/amlogic/w400/MAINTAINERS
 @@ -5,3 +5,4 @@ L:	u-boot-amlogic@groups.io
@@ -23,7 +23,7 @@ index 8587f67b46..d8f9d3bded 100644
  F:	doc/board/amlogic/w400.rst
 +F:	doc/board/amlogic/radxa-zero2.rst
 diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst
-index 9c7fadf2c0..c0c8e82792 100644
+index 4d407f9362..f0b92e4209 100644
 --- a/doc/board/amlogic/index.rst
 +++ b/doc/board/amlogic/index.rst
 @@ -19,7 +19,7 @@ This matrix concerns the actual source code version.
@@ -35,7 +35,7 @@ index 9c7fadf2c0..c0c8e82792 100644
  +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+
  | UART                          | **Yes**   | **Yes**         | **Yes**      | **Yes**     | **Yes**    | **Yes**     | **Yes**      |
  +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+
-@@ -107,6 +107,7 @@ Board Documentation
+@@ -110,6 +110,7 @@ Board Documentation
     p212
     q200
     radxa-zero

projects/Amlogic/patches/u-boot/u-boot-0014-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch

@@ -1,7 +1,7 @@
-From 6e9bcb63aa571ed451f4eff367da6b2a1b902e3d Mon Sep 17 00:00:00 2001
+From fe7e99bec813f7537b6a2c8ceda76896bea99546 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 7 Jul 2022 10:24:03 +0000
-Subject: [PATCH 12/15] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21
+Subject: [PATCH 14/16] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21
 
 Import the Beelink GT1 device-tree.
 

projects/Amlogic/patches/u-boot/u-boot-0015-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch

@@ -1,14 +1,14 @@
-From f8a80898ac6ab740a36a08b128b18ac9db122e87 Mon Sep 17 00:00:00 2001
+From b2bed8e14c8ad035c2d4089e38437e9dbf699e22 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 7 Jul 2022 10:27:01 +0000
-Subject: [PATCH 13/15] WIP: boards: amlogic: add Beelink GT1 defconfig
+Subject: [PATCH 15/16] WIP: boards: amlogic: add Beelink GT1 defconfig
 
 Add a board config for Beelink GT1 devices
 
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 ---
- configs/beelink-gt1_defconfig | 71 +++++++++++++++++++++++++++++++++++
+ configs/beelink-gt1_defconfig | 69 +++++++++++++++++++++++++++++++++++
- 1 file changed, 71 insertions(+)
+ 1 file changed, 69 insertions(+)
  create mode 100644 configs/beelink-gt1_defconfig
 
 diff --git a/configs/beelink-gt1_defconfig b/configs/beelink-gt1_defconfig
@@ -16,7 +16,7 @@ new file mode 100644
 index 0000000000..6f6051b675
 --- /dev/null
 +++ b/configs/beelink-gt1_defconfig
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,69 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_MESON=y
 +CONFIG_SYS_TEXT_BASE=0x01000000
@@ -30,8 +30,6 @@ index 0000000000..6f6051b675
 +CONFIG_IDENT_STRING=" beelink-gt1"
 +CONFIG_SYS_LOAD_ADDR=0x1000000
 +CONFIG_DEBUG_UART=y
-+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
-+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000
 +CONFIG_REMAKE_ELF=y
 +CONFIG_OF_BOARD_SETUP=y
 +# CONFIG_DISPLAY_CPUINFO is not set

projects/Amlogic/patches/u-boot/u-boot-0016-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch

@@ -1,7 +1,7 @@
-From 47ff6537b8aca906e12c541804110c99720bf025 Mon Sep 17 00:00:00 2001
+From ce948b928e80dfb3e73eceb060a4ba08f5462a36 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 14 Jul 2022 19:38:41 +0000
-Subject: [PATCH 14/15] WIP: doc: boards: amlogic: update for Beelink GT1
+Subject: [PATCH 16/16] WIP: doc: boards: amlogic: update for Beelink GT1
 
 Add documentation bits for the Beelink GT1 and GT1-Ultimate
 
@@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 doc/board/amlogic/beelink-gt1.rst
 
 diff --git a/board/amlogic/q200/MAINTAINERS b/board/amlogic/q200/MAINTAINERS
-index ba7c12b2c1..52563bb7c6 100644
+index 9c84cca27e..46beffe17f 100644
 --- a/board/amlogic/q200/MAINTAINERS
 +++ b/board/amlogic/q200/MAINTAINERS
 @@ -4,9 +4,11 @@ S:	Maintained
@@ -134,7 +134,7 @@ index 0000000000..28a7c4366f
 +    $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=512 skip=1 seek=1
 +    $ dd if=fip/u-boot.bin.sd.bin of=$DEV conv=fsync,notrunc bs=1 count=440
 diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst
-index c0c8e82792..dd7ea20ea7 100644
+index f0b92e4209..b8b6f9b98a 100644
 --- a/doc/board/amlogic/index.rst
 +++ b/doc/board/amlogic/index.rst
 @@ -15,10 +15,10 @@ This matrix concerns the actual source code version.
@@ -152,7 +152,7 @@ index c0c8e82792..dd7ea20ea7 100644
  |                               |           | JetHub J80      |              |             |            | Radxa Zero2 | BananaPi-M5  |
  +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+
  | UART                          | **Yes**   | **Yes**         | **Yes**      | **Yes**     | **Yes**    | **Yes**     | **Yes**      |
-@@ -90,6 +90,7 @@ Board Documentation
+@@ -93,6 +93,7 @@ Board Documentation
  
     beelink-gtking
     beelink-gtkingpro