From 499f7d6cf0b78894e4a5a1830daf43491e9938aa Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Jul 2022 09:07:43 +0000 Subject: [PATCH] u-boot: bump Amlogic patches for 2022.07 --- ...on64-prevent-stdout-stderr-on-video.patch} | 6 +- ...on64-remove-amlogic-so-fdtdir-finds.patch} | 10 +- ...ic-odroid-n2-remove-amlogic-prefix-.patch} | 4 +- ...rt-WeTek-Hub-Play2-DTs-from-Linux-5..patch | 10 +- ...snps-reset-on-WeTek-devices-to-fix-E.patch | 4 +- ...ic-add-board-files-for-wetek-gxbb-de.patch | 4 +- ...ards-amlogic-add-WeTek-Hub-defconfig.patch | 4 +- ...ds-amlogic-add-WeTek-Play2-defconfig.patch | 4 +- ...-ARM-dts-add-support-for-Radxa-Zero2.patch | 8 +- ...ds-amlogic-add-Radxa-Zero2-defconfig.patch | 4 +- ...oards-amlogic-update-for-Radxa-Zero2.patch | 18 +- ...mport-Beelink-GT1-DT-from-Linux-5.21.patch | 128 ++++++++++++++ ...ds-amlogic-add-Beelink-GT1-defconfig.patch | 91 ++++++++++ ...oards-amlogic-update-for-Beelink-GT1.patch | 165 ++++++++++++++++++ ...oards-amlogic-add-video-to-WeTek-Hub.patch | 39 +++++ 15 files changed, 461 insertions(+), 38 deletions(-) rename projects/Amlogic/patches/u-boot/{u-boot-0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoc.patch => u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch} (82%) rename projects/Amlogic/patches/u-boot/{u-boot-0002-HACK-configs-meson64-remove-amlogic-so-fdtdir-finds-.patch => u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch} (72%) rename projects/Amlogic/patches/u-boot/{u-boot-0003-HACK-board-amlogic-odroid-n2-remove-amlogic-prefix-f.patch => u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch} (85%) create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0015-WIP-boards-amlogic-add-video-to-WeTek-Hub.patch diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoc.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch similarity index 82% rename from projects/Amlogic/patches/u-boot/u-boot-0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoc.patch rename to projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index d0b64c34ef..842f8aaf0c 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoc.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -1,7 +1,7 @@ -From 6cf3857ecc3ed6197c08a6d2d488deb2cd86bcec Mon Sep 17 00:00:00 2001 +From 86edbd0797e43d4d1ac06575011e60170cb22440 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 13 Nov 2020 02:09:36 +0000 -Subject: [PATCH 01/11] HACK: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 01/15] 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index cb202d5555..ba095efe62 100644 +index 196e58ed9a..3b8b079e2a 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -18,7 +18,7 @@ diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-HACK-configs-meson64-remove-amlogic-so-fdtdir-finds-.patch b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch similarity index 72% rename from projects/Amlogic/patches/u-boot/u-boot-0002-HACK-configs-meson64-remove-amlogic-so-fdtdir-finds-.patch rename to projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch index 3534fcff57..82b5b54cef 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0002-HACK-configs-meson64-remove-amlogic-so-fdtdir-finds-.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch @@ -1,18 +1,18 @@ -From 0e34a38e25440bcd31cb8e8ec8e237b38a8210a9 Mon Sep 17 00:00:00 2001 +From 6a0fbd77c0151ae66962425bb6726160301bfeb5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 06:52:50 +0000 -Subject: [PATCH 02/11] HACK: configs: meson64: remove /amlogic so fdtdir finds - LE boot files +Subject: [PATCH 02/15] LOCAL: configs: meson64: remove /amlogic so fdtdir + finds LE boot files --- include/configs/meson64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index ba095efe62..d1eccf58b7 100644 +index 3b8b079e2a..7d83ef37a3 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h -@@ -96,7 +96,7 @@ +@@ -94,7 +94,7 @@ "pxefile_addr_r=0x01080000\0" \ "fdtoverlay_addr_r=0x01000000\0" \ "ramdisk_addr_r=0x13000000\0" \ diff --git a/projects/Amlogic/patches/u-boot/u-boot-0003-HACK-board-amlogic-odroid-n2-remove-amlogic-prefix-f.patch b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch similarity index 85% rename from projects/Amlogic/patches/u-boot/u-boot-0003-HACK-board-amlogic-odroid-n2-remove-amlogic-prefix-f.patch rename to projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch index 21b6621fe0..54f9020982 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0003-HACK-board-amlogic-odroid-n2-remove-amlogic-prefix-f.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch @@ -1,7 +1,7 @@ -From 158fa27c3f736047520b7ae7ffa62a82d96254d3 Mon Sep 17 00:00:00 2001 +From 8605348fc36d4079795c05acf9047a9b44e20454 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 3 Aug 2021 18:42:55 +0000 -Subject: [PATCH 03/11] HACK: board: amlogic: odroid-n2: remove /amlogic/ +Subject: [PATCH 03/15] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix for dtb path Remove the /amlogic/ prefix to align with current LE dtb locations. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/projects/Amlogic/patches/u-boot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch index e69ca7edd4..c56fc3a6be 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0004-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch @@ -1,8 +1,8 @@ -From c3460fb372cf068a2d2285c2211ac53f0e872b74 Mon Sep 17 00:00:00 2001 +From 3c9aed114551a975e42d68feea7689710644f038 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:19:43 +0000 -Subject: [PATCH 04/11] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux - 5.17 +Subject: [PATCH 04/15] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux + 5.19 Import the WeTek common dtsi and Hub/Play2 device-trees. @@ -22,10 +22,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm/dts/meson-gxbb-wetek.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index b3e2a9c9d7..c752d2bd18 100644 +index a7e0d9f6c0..05aac1b447 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -173,6 +173,8 @@ dtb-$(CONFIG_ARCH_MESON) += \ +@@ -181,6 +181,8 @@ dtb-$(CONFIG_ARCH_MESON) += \ meson-gxbb-nanopi-k2.dtb \ meson-gxbb-p200.dtb \ meson-gxbb-p201.dtb \ diff --git a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch index bb95db22e3..5a09fa4b6e 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch @@ -1,7 +1,7 @@ -From 18bfa4ae63357f81e7f09d70c619e87c1f60696f Mon Sep 17 00:00:00 2001 +From 8ddf1b4cee0fb1a804b7cc82a7a1c69019a8e18f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:29:19 +0000 -Subject: [PATCH 05/11] WIP: ARM: dts: use snps,reset on WeTek devices to fix +Subject: [PATCH 05/15] 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 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch index 9446e1af42..b15232d360 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch @@ -1,7 +1,7 @@ -From e2f70c9256c5b79cf6b03ea5990642ab78529f10 Mon Sep 17 00:00:00 2001 +From 6722c7734b2f6fa8a7e6a655d792ae3d1ca891d6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 05:45:29 +0000 -Subject: [PATCH 06/11] WIP: boards: amlogic: add board files for wetek-gxbb +Subject: [PATCH 06/15] WIP: boards: amlogic: add board files for wetek-gxbb devices These support the WeTek Hub and Play2 devices. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch index 03e045fbcb..19e08fc208 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch @@ -1,7 +1,7 @@ -From 5ce0dcc6ce0f39792d9bd330132090440eaa4133 Mon Sep 17 00:00:00 2001 +From c6aa036d08a918583aea24c24cab85555f057006 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Feb 2021 06:03:00 +0000 -Subject: [PATCH 07/11] WIP: boards: amlogic: add WeTek Hub defconfig +Subject: [PATCH 07/15] WIP: boards: amlogic: add WeTek Hub defconfig Signed-of-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch index be27111740..41f6df8a6b 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch @@ -1,7 +1,7 @@ -From 6913bac2c599b089795060b402f5d2957fbef641 Mon Sep 17 00:00:00 2001 +From eb94f8ab5bbfc7acb86bf4ed4347f4661bddce05 Mon Sep 17 00:00:00 2001 From: chewitt Date: Sat, 27 Feb 2021 06:04:00 +0000 -Subject: [PATCH 08/11] WIP: boards: amlogic: add WeTek Play2 defconfig +Subject: [PATCH 08/15] WIP: boards: amlogic: add WeTek Play2 defconfig Signed-off-by: Christian Hewittt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch index 2cf5d0d662..dfa27a1b36 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ -From 2eb1f5fbbaa40bb3c54189cad4298c1d6b949608 Mon Sep 17 00:00:00 2001 +From c808f39045b742949d3e1a11666eebb3a08dcfd8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:17:23 +0000 -Subject: [PATCH 09/11] WIP: ARM: dts: add support for Radxa Zero2 +Subject: [PATCH 09/15] WIP: ARM: dts: add support for Radxa Zero2 Import the initial dts (WIP) from chewitt/amlogic-5.16.y @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm/dts/meson-g12b-radxa-zero2.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index c752d2bd18..44241fafee 100644 +index 05aac1b447..abe3a67420 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -194,6 +194,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ +@@ -202,6 +202,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ meson-g12b-gsking-x.dtb \ meson-g12b-odroid-n2.dtb \ meson-g12b-odroid-n2-plus.dtb \ diff --git a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch index 00df81d57c..8ef99ea12c 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch @@ -1,7 +1,7 @@ -From 2200a94ab134393483c0f154a2c98c25d3e41a08 Mon Sep 17 00:00:00 2001 +From 952b367deb82ab8f4dc48f6170562e134389d31f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:23:29 +0000 -Subject: [PATCH 10/11] WIP: boards: amlogic: add Radxa Zero2 defconfig +Subject: [PATCH 10/15] WIP: boards: amlogic: add Radxa Zero2 defconfig Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch index ff7e9bfd68..94d93c5780 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ -From 9d8b7974d563683553bf3277f76657e5f54dd3ea Mon Sep 17 00:00:00 2001 +From 00abe0faee0cc8a58615dafc609cb54edcf74989 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:35:47 +0000 -Subject: [PATCH 11/11] WIP: doc: boards: amlogic: update for Radxa Zero2 +Subject: [PATCH 11/15] WIP: doc: boards: amlogic: update for Radxa Zero2 Add documentation bits for the Radxa Zero2 @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt doc/board/amlogic/index.rst | 3 +- .../{radxa-zero.rst => radxa-zero2.rst} | 29 ++++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) - rename doc/board/amlogic/{radxa-zero.rst => radxa-zero2.rst} (75%) + 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 @@ -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 189b1efe2b..8369f6f3d0 100644 +index 9c7fadf2c0..c0c8e82792 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 189b1efe2b..8369f6f3d0 100644 +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ -@@ -99,6 +99,7 @@ Board Documentation +@@ -107,6 +107,7 @@ Board Documentation p212 q200 radxa-zero @@ -44,10 +44,10 @@ index 189b1efe2b..8369f6f3d0 100644 sei510 sei610 diff --git a/doc/board/amlogic/radxa-zero.rst b/doc/board/amlogic/radxa-zero2.rst -similarity index 75% +similarity index 76% rename from doc/board/amlogic/radxa-zero.rst rename to doc/board/amlogic/radxa-zero2.rst -index 423403f3c7..24bc1b0767 100644 +index f5611f52ec..95a42a05d0 100644 --- a/doc/board/amlogic/radxa-zero.rst +++ b/doc/board/amlogic/radxa-zero2.rst @@ -1,18 +1,17 @@ @@ -95,7 +95,7 @@ index 423403f3c7..24bc1b0767 100644 $ make Image creation -@@ -40,6 +40,7 @@ git trees published by the board vendor: +@@ -42,6 +42,7 @@ git trees published by the board vendor: .. code-block:: bash @@ -103,7 +103,7 @@ index 423403f3c7..24bc1b0767 100644 $ git clone -b radxa-zero-v2021.07 https://github.com/radxa/u-boot.git $ git clone https://github.com/radxa/fip.git -@@ -52,11 +53,11 @@ git trees published by the board vendor: +@@ -54,11 +55,11 @@ git trees published by the board vendor: $ export CROSS_COMPILE=/opt/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf/bin/aarch64-none-elf- $ export ARCH=arm $ cd u-boot diff --git a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch new file mode 100644 index 0000000000..98063bec22 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch @@ -0,0 +1,128 @@ +From 6e9bcb63aa571ed451f4eff367da6b2a1b902e3d Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 7 Jul 2022 10:24:03 +0000 +Subject: [PATCH 12/15] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 + +Import the Beelink GT1 device-tree. + +Signed-off-by: Christian Hewitt +--- + .../dts/meson-gxm-gt1-ultimate-u-boot.dtsi | 7 ++ + arch/arm/dts/meson-gxm-gt1-ultimate.dts | 91 +++++++++++++++++++ + 2 files changed, 98 insertions(+) + create mode 100644 arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-gxm-gt1-ultimate.dts + +diff --git a/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi b/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi +new file mode 100644 +index 0000000000..39270ea71c +--- /dev/null ++++ b/arch/arm/dts/meson-gxm-gt1-ultimate-u-boot.dtsi +@@ -0,0 +1,7 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS. ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-gxl-u-boot.dtsi" +diff --git a/arch/arm/dts/meson-gxm-gt1-ultimate.dts b/arch/arm/dts/meson-gxm-gt1-ultimate.dts +new file mode 100644 +index 0000000000..2c267884cc +--- /dev/null ++++ b/arch/arm/dts/meson-gxm-gt1-ultimate.dts +@@ -0,0 +1,91 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-gxm.dtsi" ++#include "meson-gx-p23x-q20x.dtsi" ++#include ++#include ++ ++/ { ++ compatible = "azw,gt1-ultimate", "amlogic,s912", "amlogic,meson-gxm"; ++ model = "Beelink GT1 Ultimate"; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-white { ++ color = ; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; ++ default-state = "on"; ++ panic-indicator; ++ }; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 0>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1710000>; ++ ++ button-function { ++ label = "update"; ++ linux,code = ; ++ press-threshold-microvolt = <10000>; ++ }; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>; ++ pinctrl-names = "default"; ++ phy-handle = <&external_phy>; ++ amlogic,tx-delay-ns = <2>; ++ phy-mode = "rgmii"; ++}; ++ ++&external_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_15 */ ++ interrupts = <25 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&ir { ++ linux,rc-map-name = "rc-beelink-gs1"; ++}; ++ ++&sd_emmc_a { ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++&uart_A { ++ status = "okay"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ max-speed = <2000000>; ++ clocks = <&wifi32k>; ++ clock-names = "lpo"; ++ }; ++}; +-- +2.17.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch new file mode 100644 index 0000000000..5c013dbc33 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch @@ -0,0 +1,91 @@ +From f8a80898ac6ab740a36a08b128b18ac9db122e87 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 7 Jul 2022 10:27:01 +0000 +Subject: [PATCH 13/15] WIP: boards: amlogic: add Beelink GT1 defconfig + +Add a board config for Beelink GT1 devices + +Signed-off-by: Christian Hewitt +--- + configs/beelink-gt1_defconfig | 69 +++++++++++++++++++++++++++++++++++ + 1 file changed, 69 insertions(+) + create mode 100644 configs/beelink-gt1_defconfig + +diff --git a/configs/beelink-gt1_defconfig b/configs/beelink-gt1_defconfig +new file mode 100644 +index 0000000000..6f6051b675 +--- /dev/null ++++ b/configs/beelink-gt1_defconfig +@@ -0,0 +1,69 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MESON=y ++CONFIG_SYS_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="meson-gxm-gt1-ultimate" ++CONFIG_MESON_GXM=y ++CONFIG_DEBUG_UART_BASE=0xc81004c0 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING=" beelink-gt1" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_REMAKE_ELF=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_ADC=y ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SARADC_MESON=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_ETH=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MMIOREG=y ++CONFIG_MESON_GXL_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_GXL=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_GX_VPU_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_RESET=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_DWC3_MESON_GXL=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e ++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_DM_VIDEO=y ++# CONFIG_VIDEO_BPP8 is not set ++# CONFIG_VIDEO_BPP16 is not set ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_VIDEO_MESON=y ++CONFIG_VIDEO_DT_SIMPLEFB=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.17.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch new file mode 100644 index 0000000000..51ca4e27cf --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch @@ -0,0 +1,165 @@ +From 47ff6537b8aca906e12c541804110c99720bf025 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 14 Jul 2022 19:38:41 +0000 +Subject: [PATCH 14/15] WIP: doc: boards: amlogic: update for Beelink GT1 + +Add documentation bits for the Beelink GT1 and GT1-Ultimate + +Signed-off-by: Christian Hewitt +--- + board/amlogic/q200/MAINTAINERS | 2 + + doc/board/amlogic/beelink-gt1.rst | 98 +++++++++++++++++++++++++++++++ + doc/board/amlogic/index.rst | 9 +-- + 3 files changed, 105 insertions(+), 4 deletions(-) + 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 +--- a/board/amlogic/q200/MAINTAINERS ++++ b/board/amlogic/q200/MAINTAINERS +@@ -4,9 +4,11 @@ S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/q200/ + F: include/configs/q200.h ++F: configs/beelink-gt1_defconfig + F: configs/khadas-vim2_defconfig + F: configs/libretech-s905d-pc_defconfig + F: configs/libretech-s912-pc_defconfig + F: configs/wetek-core2_defconfig ++F: doc/board/amlogic/beelink-gt1.rst + F: doc/board/amlogic/khadas-vim2.rst + F: doc/board/amlogic/wetek-core2.rst +diff --git a/doc/board/amlogic/beelink-gt1.rst b/doc/board/amlogic/beelink-gt1.rst +new file mode 100644 +index 0000000000..28a7c4366f +--- /dev/null ++++ b/doc/board/amlogic/beelink-gt1.rst +@@ -0,0 +1,98 @@ ++.. SPDX-License-Identifier: GPL-2.0+ ++ ++U-Boot for Beelink GT1/GT1-Ultimate ++=================================== ++ ++The Shenzen AZW (Beelink) GT1 and GT1-Ultimate are based on the Amlogic ++Q200 reference board with an S912 chip. ++ ++- 2GB or 3GB DDR3 RAM ++- 32GB eMMC ++- HDMI 2.1 video ++- S/PDIF optical output ++- 10/100/1000 Ethernet ++- AP6356S Wireless (802.11 a/b/g/n/ac, BT 4.2) ++- 3x USB 2.0 ports ++- IR receiver ++- 1x micro SD card slot ++- 1x Power LED (white) ++- 1x Reset button (internal) ++ ++Beelink do not provide public schematics, but have been willing ++to share them with known distro developers on request. ++ ++U-Boot compilation ++------------------ ++ ++.. code-block:: bash ++ ++ $ export CROSS_COMPILE=aarch64-none-elf- ++ $ make beelink-gt1_defconfig ++ $ make ++ ++Image creation ++-------------- ++ ++Amlogic does not provide sources for the firmware and for tools needed ++to create the bootloader image. Beelink have provided the Amlogic SDK ++u-boot sources to known distro developers on-request, allowing FIPs to ++be generated. The GT1 (2GB) and GT1-Ultimate (3GB) models differ in ++RAM size and original Beelink devices use the same spec RAM chips and ++can share the same boot FIPs: ++ ++https://github.com/LibreELEC/amlogic-boot-fip/tree/master/beelink-gt1 ++ ++For simplified usage, pleaser refer to :doc:`pre-generated-fip` with codename `beelink-gt1` ++ ++.. code-block:: bash ++ ++ $ wget https://github.com/LibreELEC/amlogic-boot-fip/archive/master.zip ++ $ unzip master.zip ++ $ export FIPDIR=$PWD/amlogic-boot-fip/beelink-gt1 ++ ++Go back to the mainline U-Boot source tree then: ++ ++.. code-block:: bash ++ ++ $ mkdir fip ++ $ cp $FIPDIR/* fip/ ++ $ cp u-boot.bin fip/bl33.bin ++ ++ $ sh fip/blx_fix.sh \ ++ fip/bl30.bin \ ++ fip/zero_tmp \ ++ fip/bl30_zero.bin \ ++ fip/bl301.bin \ ++ fip/bl301_zero.bin \ ++ fip/bl30_new.bin \ ++ bl30 ++ ++ $ python fip/acs_tool.pyc fip/bl2.bin fip/bl2_acs.bin fip/acs.bin 0 ++ ++ $ sh fip/blx_fix.sh \ ++ fip/bl2_acs.bin \ ++ fip/zero_tmp \ ++ fip/bl2_zero.bin \ ++ fip/bl21.bin \ ++ fip/bl21_zero.bin \ ++ fip/bl2_new.bin \ ++ bl2 ++ ++ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl30_new.bin ++ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl31.img ++ $ fip/gxl/aml_encrypt_gxl --bl3enc --input fip/bl33.bin ++ $ fip/gxl/aml_encrypt_gxl --bl2sig --input fip/bl2_new.bin --output fip/bl2.n.bin.sig ++ $ fip/gxl/aml_encrypt_gxl --bootmk \ ++ --output fip/u-boot.bin \ ++ --bl2 fip/bl2.n.bin.sig \ ++ --bl30 fip/bl30_new.bin.enc \ ++ --bl31 fip/bl31.img.enc \ ++ --bl33 fip/bl33.bin.enc ++ ++And then write the image to SD or eMMC with: ++ ++.. code-block:: bash ++ ++ $ DEV=/dev/your_sd_device ++ $ 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 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -15,10 +15,10 @@ This matrix concerns the actual source code version. + | | | S805X | S905D | | S905D2 | A311D | S905D3 | + | | | S905W | | | S905Y2 | | | + +===============================+===========+=================+==============+=============+============+=============+==============+ +-| Boards | Odroid-C2 | P212 | Khadas VIM2 | S400 | U200 | Odroid-N2 | SEI610 | +-| | Nanopi-K2 | Khadas-VIM | Libretech-PC | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | +-| | P200 | LibreTech-CC v1 | WeTek Core2 | | Radxa Zero | GT-King/Pro | Odroid-C4 | +-| | P201 | LibreTech-AC v2 | | | | GSKing-X | Odroid-HC4 | ++| Boards | Odroid-C2 | P212 | Beelink GT1 | S400 | U200 | Odroid-N2 | SEI610 | ++| | Nanopi-K2 | Khadas-VIM | Khadas VIM2 | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | ++| | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | ++| | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | + | | | JetHub J80 | | | | Radxa Zero2 | BananaPi-M5 | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | +@@ -90,6 +90,7 @@ Board Documentation + + beelink-gtking + beelink-gtkingpro ++ beelink-gt1 + jethub-j100 + jethub-j80 + khadas-vim2 +-- +2.17.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-boards-amlogic-add-video-to-WeTek-Hub.patch b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-boards-amlogic-add-video-to-WeTek-Hub.patch new file mode 100644 index 0000000000..3a08a6b02e --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-boards-amlogic-add-video-to-WeTek-Hub.patch @@ -0,0 +1,39 @@ +From 9bc2096ac8a3ffd6bbe12a4369654f42f4c93690 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Fri, 29 Jul 2022 09:43:33 +0000 +Subject: [PATCH 15/15] WIP: boards: amlogic: add video to WeTek Hub + +--- + configs/wetek-hub_defconfig | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig +index 73fd7c4211..07e10c555d 100644 +--- a/configs/wetek-hub_defconfig ++++ b/configs/wetek-hub_defconfig +@@ -54,15 +54,15 @@ CONFIG_USB=y + CONFIG_DM_USB=y + CONFIG_USB_DWC2=y + CONFIG_USB_KEYBOARD=y +-# CONFIG_DM_VIDEO is not set ++CONFIG_DM_VIDEO=y + # CONFIG_VIDEO_BPP8 is not set + # CONFIG_VIDEO_BPP16 is not set +-# CONFIG_SYS_WHITE_ON_BLACK is not set +-# CONFIG_VIDEO_MESON is not set +-# CONFIG_VIDEO_DT_SIMPLEFB is not set +-# CONFIG_SPLASH_SCREEN is not set +-# CONFIG_SPLASH_SCREEN_ALIGN is not set +-# CONFIG_VIDEO_BMP_RLE8 is not set ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_VIDEO_MESON=y ++CONFIG_VIDEO_DT_SIMPLEFB=y ++CONFIG_SPLASH_SCREEN=y ++CONFIG_SPLASH_SCREEN_ALIGN=y ++CONFIG_VIDEO_BMP_RLE8=y + CONFIG_BMP_16BPP=y + CONFIG_BMP_24BPP=y + CONFIG_BMP_32BPP=y +-- +2.17.1 +