diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 8420a826f0..904dae55c0 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,11 +16,11 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="98f7e32f20d28ec452afb208f9cffc08448a2652" # 6.11.0 - PKG_SHA256="" + PKG_VERSION="05b1367d372aca98a4e09c1a0e7ff0b9d721b2bc" # 6.11.5 + PKG_SHA256="620a6206fadecdc3950b1e83eba5241df20e8e45b4e14496af4774d95764b141" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" - PKG_PATCH_DIRS="default rtlwifi/6.11.2 rtlwifi/6.12 rtlwifi/after-6.12" + PKG_PATCH_DIRS="default rtlwifi/6.12 rtlwifi/after-6.12" ;; raspberrypi) PKG_VERSION="8ee418c866c263941fb468bc1eeab1d8059db705" # 6.6.57 diff --git a/packages/sysutils/systemd/config/system.d/openvpn.service.sample b/packages/sysutils/systemd/config/system.d/openvpn.service.sample index 426e16320b..e2e6f7e473 100644 --- a/packages/sysutils/systemd/config/system.d/openvpn.service.sample +++ b/packages/sysutils/systemd/config/system.d/openvpn.service.sample @@ -14,14 +14,13 @@ WantedBy=kodi.target # NOTES: # -# 1) Edit /storage/.config/openvpn.config to the .config/.conf/.ovpn file -# from your VPN service provider and test it works first by connecting at -# the console: +# 1) Create /storage/.config/openvpn.config using the .config/.conf/.ovpn +# file from your VPN service provider and test the connection: # # /usr/sbin/openvpn --daemon --config /storage/.config/openvpn.config # -# 2) The openvpn.service file must be addeded to the active systemd config -# before it will work. This is done by running: +# 2) The openvpn.service file must be enabled before it will work. This is +# done by running: # # systemctl enable openvpn.service # diff --git a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb index a45d4c5226..4832194721 100644 --- a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb +++ b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb @@ -10,6 +10,10 @@ evdev:input:b0005v045Ep0041* KEYBOARD_KEY_7006f=x KEYBOARD_KEY_7006e=i +# bt250 remote +evdev:input:b0005v1D5ApC080e0000* + KEYBOARD_KEY_c0041=enter + # buzztv bt-300/bt-400 smart remote evdev:input:b0005v0957p1001* KEYBOARD_KEY_c0041=enter diff --git a/packages/tools/amlogic-boot-fip/package.mk b/packages/tools/amlogic-boot-fip/package.mk index 1b6fff0c76..85c1e745f8 100644 --- a/packages/tools/amlogic-boot-fip/package.mk +++ b/packages/tools/amlogic-boot-fip/package.mk @@ -3,10 +3,16 @@ PKG_NAME="amlogic-boot-fip" PKG_LICENSE="nonfree" -PKG_VERSION="1d9dc4ede9741f184509e7a8ec9797a6e0fd39d9" -PKG_SHA256="df8ec3c7ae1362cb8583f0427af2cb9aac3bdfa0cb6550ec5a7ab8c04c4f09c4" +PKG_VERSION="8599bc77b17f38e69275f6145acc5792faab735e" +PKG_SHA256="c5fb2ee6026dc8ffb38af7660d52761506363d95c6a0fc27833cd6c611e10602" PKG_SITE="https://github.com/LibreELEC/amlogic-boot-fip" PKG_URL="https://github.com/LibreELEC/amlogic-boot-fip/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Firmware Image Package (FIP) sources used to sign Amlogic u-boot binaries in LibreELEC images" PKG_TOOLCHAIN="manual" PKG_STAMP="${UBOOT_SYSTEM}" + +post_unpack() { + # rename dirs for alta/solitude + mv ${PKG_BUILD}/aml-a311d-cc ${PKG_BUILD}/alta + mv ${PKG_BUILD}/aml-s905d3-cc ${PKG_BUILD}/solitude +} diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 768830c38c..3cbafc75c7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch @@ -1,4 +1,4 @@ -From c10c853a2171806795b651d345e6f2e219231b17 Mon Sep 17 00:00:00 2001 +From 1f8a8dd773396c9b62c0b407ff66312740e8b17b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 Subject: [PATCH 01/35] LOCAL: set meson-gx cma pool to 896MB diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch index dfc2b5649c..e070a00ad2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch @@ -1,4 +1,4 @@ -From 00e2f20560ea8e7a7b8599eb84b6b4ec87aa6e9f Mon Sep 17 00:00:00 2001 +From d50541a95057fa0d9e1878caacc8c61fcef4e34b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 Subject: [PATCH 02/35] LOCAL: set meson-g12 cma pool to 896MB diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch index fba2e5fa66..91bba9e0ad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,4 +1,4 @@ -From df51d70e7c239929672aaef042f5d2dd82b2ebb9 Mon Sep 17 00:00:00 2001 +From c009e6c4f96369f43cd5d340f2896d2462d5de60 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 Subject: [PATCH 03/35] LOCAL: arm64: fix Kodi sysinfo CPU information diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index ffffeb145e..63cfa70f77 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,4 +1,4 @@ -From 1d18a30d304758cfe0dbfa24a6726c2bc3662f0d Mon Sep 17 00:00:00 2001 +From 56481fb881d909e5ac9e68b2f958453a1ba67bc7 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 Subject: [PATCH 04/35] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch index afbe3afd48..9e3535e674 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch @@ -1,4 +1,4 @@ -From f77ed164339433e1c3d5516fb222dace58fe8b5e Mon Sep 17 00:00:00 2001 +From 44cc4cb767d96b9c66e214a550c54d12eb2469a3 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 Subject: [PATCH 05/35] LOCAL: arm64: dts: meson: add support for GX PM and diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 32658667e1..98001de985 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,4 +1,4 @@ -From 64c8a0f6d4d996cf19ce7c60342145a3734ea5ee Mon Sep 17 00:00:00 2001 +From 595fe6dde1371f59de9018637bb6ea30e0d81e28 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 Subject: [PATCH 06/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 35f37b3789..1195316bbf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,4 +1,4 @@ -From 9d3334346553c8939bfad508e0653183bef1a8a1 Mon Sep 17 00:00:00 2001 +From 3b2e31b827e4c401787afcd9064d89a586b51eb6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 Subject: [PATCH 07/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index ceb1093cbc..51509c0603 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,4 +1,4 @@ -From ecf83ea2a6eba1e155f0bb1109f0ec587c3cd295 Mon Sep 17 00:00:00 2001 +From a4f47c9488db37ca73a3338f5508d939a3da2fc1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 Subject: [PATCH 08/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch index da04e09345..e736d65b87 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch @@ -1,4 +1,4 @@ -From c2aadae4e1d972f45ce2922216248b6e10d35119 Mon Sep 17 00:00:00 2001 +From 0ddd7b0801bd3e83baecd21693d38ba7517f6d74 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 Subject: [PATCH 09/35] LOCAL: ASoC: meson: assign internal PCM diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch index b8ff8cfc29..690af15f7e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch @@ -1,4 +1,4 @@ -From e75df97211041efbb284709e0fb48aa70949da48 Mon Sep 17 00:00:00 2001 +From 4691141558d9cd4a25d1a701c59083849e9c54dc Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 Subject: [PATCH 10/35] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch index d99904444b..a3f713a27f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch @@ -1,4 +1,4 @@ -From 77d60071b759c40f416b143c704c6a4b9540bc1a Mon Sep 17 00:00:00 2001 +From 8c7e90a5dacf95f777c1f4b002670668b13b164d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 28 Aug 2024 15:53:56 +0200 Subject: [PATCH 11/35] FROMGIT(6.12): arm64: dts: amlogic: add clock and diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch index 756117d1df..403ad506b0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch @@ -1,4 +1,4 @@ -From dcbe7ff6cbac1d657292105e1204a54337876562 Mon Sep 17 00:00:00 2001 +From b16565d736b4744e97d2ff7e301e50e76c9a27ac Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 1 Jun 2024 15:46:42 +0000 Subject: [PATCH 12/35] FROMGIT(6.12): dt-bindings: media: amlogic,gx-vdec: add diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch index f84afefbe7..de7ad00eaa 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch @@ -1,4 +1,4 @@ -From 336acb5208b6c3b191772c4bbe89453af8c40313 Mon Sep 17 00:00:00 2001 +From c73239247ba486f899fcd291334a4ff3536cfba4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 1 Jun 2024 15:51:07 +0000 Subject: [PATCH 13/35] FROMGIT(6.12): media: meson: vdec: add GXLX SoC diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index ad1f52a2e9..a739e0818e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,4 +1,4 @@ -From ac7976449f94f467b90be088c475c565185df593 Mon Sep 17 00:00:00 2001 +From 0d10690c3adead40e44d87ccc494f27715a21505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Feb 2022 08:23:12 +0000 Subject: [PATCH 14/35] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index 9668ce350a..27d077c548 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,4 +1,4 @@ -From a909b03eaa420b27578c39b37782d083dc78fbc5 Mon Sep 17 00:00:00 2001 +From a84f13e095df1e67ad3c68542466dd406d9022ec Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 Subject: [PATCH 15/35] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 1543eb1649..b43f75a2be 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,4 +1,4 @@ -From a5922e5e617e614784c44d7014f79a8a96ea51c7 Mon Sep 17 00:00:00 2001 +From abb95907d5899b8f29d9186f1e90e78f5ee9f856 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 Subject: [PATCH 16/35] FROMLIST(v5): docs: ABI: document tm1628 attribute diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index 4397972c26..64bee2df34 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,4 +1,4 @@ -From 8aabbce92cedee2b1185c2052e4f31c3f8bffc0e Mon Sep 17 00:00:00 2001 +From 47885946b23860ee8610815c5adca8277ed9f859 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 Subject: [PATCH 17/35] FROMLIST(v5): auxdisplay: add support for Titanmec diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index 72f57cb99a..d8aef3315b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,4 +1,4 @@ -From 8264a2fb9e7c074325c84785f4350b8e211b1360 Mon Sep 17 00:00:00 2001 +From 0d6b6009384cca989fa528882718a6d4f526afba Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 Subject: [PATCH 18/35] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index 8b05e7df99..fb0e3b21b0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,4 +1,4 @@ -From bef741ca3036ec5d304ac717eceac108d1fe09f0 Mon Sep 17 00:00:00 2001 +From e7fb99446f773b250152894f4dbf830f44a4d312 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 Subject: [PATCH 19/35] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index d31bdd2069..f3c1d5fb97 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,4 +1,4 @@ -From 308949c7e2c71305266f529a0e8a2acaae3d88e3 Mon Sep 17 00:00:00 2001 +From 9f81dde746e981d7e2f52b62c082a89832b76070 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 Subject: [PATCH 20/35] FROMLIST(v1): ASoC: hdmi-codec: reorder channel diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index 2e0b1ff28f..ebb4c4348c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,4 +1,4 @@ -From a34c0a9239a990937e21ca3fdf6c58b88e40a409 Mon Sep 17 00:00:00 2001 +From 7afe424a6ea0219a4271ffb332175a1f070d077b Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 Subject: [PATCH 21/35] FROMLIST(v1): media: meson: vdec: esparser: check diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index 48b309a7c2..efde42602b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,4 +1,4 @@ -From 3058edcf23558c1981045027dcb15d02b456b43d Mon Sep 17 00:00:00 2001 +From 6439673b09f09a9e33a7c06e6be20254da1930bc Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 Subject: [PATCH 22/35] FROMLIST(v2): media: meson: vdec: implement 10bit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index ea6edc68ca..c740926e40 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,4 +1,4 @@ -From 1313e9587848ed846d2f5ef2373712aa0a80bb61 Mon Sep 17 00:00:00 2001 +From 5264b9d677f2972f8664958dff88adc3226f96cf Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 Subject: [PATCH 23/35] FROMLIST(v2): media: meson: vdec: add HEVC decode codec diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch index 11a40c931b..9c5c6cc007 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch @@ -1,4 +1,4 @@ -From afeaf33b612fa359c1f2080cf179fddb5d099fc4 Mon Sep 17 00:00:00 2001 +From c8d6e29f58b2ee6e9718fc0b903b86a5fa3821b9 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:04:49 +0100 Subject: [PATCH 24/35] FROMLIST(v1): iio: adc: meson: fix voltage reference diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch index 25c775eb47..703b677abe 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch @@ -1,4 +1,4 @@ -From 6ced1ee3d8cddbc5fd33e90c07741c404fb1acdd Mon Sep 17 00:00:00 2001 +From b48aff8d86bbdcbf1b55b16c2a279c4adb48d9e3 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:30:02 +0100 Subject: [PATCH 25/35] FROMLIST(v1): iio: adc: consistently use bool and enum diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch index e1f1e94269..d046176532 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch @@ -1,4 +1,4 @@ -From 81fd17f0b7b188e9c42c0ace5aef314fb049501a Mon Sep 17 00:00:00 2001 +From fb2ceb994dbdd3aaaa02bd4b1727b8d573ecf3bd Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:35:58 +0100 Subject: [PATCH 26/35] FROMLIST(v1): iio: adc: meson: simplify diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch index 4fd0e7a324..a73d848ea1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch @@ -1,4 +1,4 @@ -From 6bcf59bdbd8f85188ac652a7874eafc98272d6bf Mon Sep 17 00:00:00 2001 +From 09110c8ac8d41bef0a7eee04cfd8e59e3a14a72b Mon Sep 17 00:00:00 2001 From: Da Xue Date: Fri, 24 May 2024 15:17:37 +0000 Subject: [PATCH 27/35] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch index 3bb3abbf9c..ea5dca50fe 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch @@ -1,4 +1,4 @@ -From 88b219a016ccbe6534ef7e26009e928447c98689 Mon Sep 17 00:00:00 2001 +From 4bf42b6cc2a476fb3e24417feff3560badfc28f5 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:38:59 +0100 Subject: [PATCH 28/35] FROMLIST(v1): dt-bindings: iio: adc: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch index 212318494a..00202232a6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch @@ -1,4 +1,4 @@ -From b9c9f83faceff5cf074c233e7ba74089e3cf3477 Mon Sep 17 00:00:00 2001 +From ca073dee6ab59ec0229f9ed32b123caaddea988a Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:44:41 +0100 Subject: [PATCH 29/35] FROMLIST(v1): iio: adc: meson: add support for the GXLX diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch index 8d6b1b9a11..9cf70277ec 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch @@ -1,4 +1,4 @@ -From 72e2c72fb9d2b7cf421187616c759232f3e7a7c4 Mon Sep 17 00:00:00 2001 +From 9628a8629c16d055d0c3a6020a902c47705ce5dc Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 5 Jun 2024 11:15:11 +0200 Subject: [PATCH 30/35] FROMLIST(v1): dt-bindings: usb: dwc2: allow device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch index 9540987b92..cfcbc0e814 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch @@ -1,4 +1,4 @@ -From 4c5157d6e917df3acf5c44955bab894db101d32a Mon Sep 17 00:00:00 2001 +From 990e1d9a131a713fb00939151675cd7e857eb537 Mon Sep 17 00:00:00 2001 From: Zelong Dong Date: Wed, 3 Jul 2024 17:38:58 +0800 Subject: [PATCH 31/35] FROMLIST(v1): media: rc: meson-ir: support PM diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch index bfc166c233..e6c954d7f6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch @@ -1,4 +1,4 @@ -From 839aaf55e76c7debea6c4376f54069fd53ddbfe4 Mon Sep 17 00:00:00 2001 +From 4bcb695953fb804781fdd2a51968b64a5bc116f7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 4 Jun 2024 10:49:58 +0000 Subject: [PATCH 32/35] WIP: media: meson: vdec: add HEVC and remove MPEG1/2 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch index 92c7db7e3e..2f0512c3b2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch @@ -1,4 +1,4 @@ -From 1a55206f01aa409dbf1426ff267d51ffc2526855 Mon Sep 17 00:00:00 2001 +From cb948f94d5ca684758eb6745ceb088407017a9ee Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Tue, 2 Apr 2024 14:22:52 +0000 Subject: [PATCH 33/35] WIP: media: meson: vdec: reintroduce wiggle room diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch index d62905c32a..de4e13f054 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -1,4 +1,4 @@ -From b924a18b08bc7f51b8e315cb8d5838ef42fd78ea Mon Sep 17 00:00:00 2001 +From 30b58b11eddc6a44d8ae9808bb7f3d4484ca7622 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Mar 2023 01:13:15 +0000 Subject: [PATCH 34/35] WIP: media: meson: vdec: fix memory leak of 'new_frame' diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch index 00f8c1c739..c9c898029b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch @@ -1,4 +1,4 @@ -From 45e7be20199750cf5a5058bd8ad01ad7e4d71531 Mon Sep 17 00:00:00 2001 +From ab5e8fc419ff534374415ded95b1596c235363fd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 7 Jul 2024 03:16:12 +0000 Subject: [PATCH 35/35] Revert "drm/meson: vclk: fix calculation of 59.94 diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 461f529d3a..761d1f31e4 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.11.0 Kernel Configuration +# Linux/arm64 6.11.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-14.2.0 (GCC) 14.2.0" CONFIG_CC_IS_GCC=y @@ -1018,6 +1018,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_TUNNEL is not set CONFIG_IPV6_FOU=m CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set # CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_SEG6_LWTUNNEL is not set # CONFIG_IPV6_SEG6_HMAC is not set @@ -3883,7 +3884,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m # # Chips&Media media platform drivers # -# CONFIG_VIDEO_E5010_JPEG_ENC is not set # # Intel media platform drivers @@ -4388,6 +4388,8 @@ CONFIG_DRM_BRIDGE_CONNECTOR=y # CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y +CONFIG_DRM_EXEC=m +CONFIG_DRM_GPUVM=m CONFIG_DRM_GEM_DMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m CONFIG_DRM_SCHED=y @@ -7085,6 +7087,9 @@ CONFIG_KEYS=y # CONFIG_ENCRYPTED_KEYS is not set CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_HARDENED_USERCOPY is not set diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index 32f798a931..8812a26816 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -1,7 +1,7 @@ -From 0d04eb6409191d48adc9e1d347a94af06d84351e Mon Sep 17 00:00:00 2001 +From 3f8ffb82b65019d9ee227f15e6a1b8cc7552e448 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 13 Nov 2020 02:09:36 +0000 -Subject: [PATCH 1/2] LOCAL: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 01/12] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_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 efab9a624dc..0976774e5c8 100644 +index ccb8ea2e716..8b6f8159e78 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -28,7 +28,7 @@ diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch index 1988f1e9ed..756e4a2b08 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch @@ -1,8 +1,8 @@ -From e4e38f7442b36cba26eae9edc69f7804e87a6a36 Mon Sep 17 00:00:00 2001 +From 5270aa7c201493773266854466708a8ffd1f0d74 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 3 Aug 2021 18:42:55 +0000 -Subject: [PATCH 2/2] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix - for dtb path +Subject: [PATCH 02/12] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ + prefix for dtb path Remove the /amlogic/ prefix to align with current LE dtb locations. @@ -12,10 +12,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c -index a4bcc62174a..f840afbfd67 100644 +index ae953d0e4ba..e98580631ec 100644 --- a/board/amlogic/odroid-n2/odroid-n2.c +++ b/board/amlogic/odroid-n2/odroid-n2.c -@@ -63,7 +63,7 @@ static void odroid_set_fdtfile(char *soc, char *variant) +@@ -62,7 +62,7 @@ static void odroid_set_fdtfile(char *soc, char *variant) { char s[128]; diff --git a/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-board-libretech-ac-move-board-support-into-d.patch b/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-board-libretech-ac-move-board-support-into-d.patch new file mode 100644 index 0000000000..4d1a4d8de0 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0003-FROMGIT-board-libretech-ac-move-board-support-into-d.patch @@ -0,0 +1,136 @@ +From 17b878fcccac17b59a8abfd7a72f36723bb3fd77 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Tue, 17 Sep 2024 14:34:45 +0200 +Subject: [PATCH 03/12] FROMGIT: board: libretech-ac: move board support into + dedicated directory + +The libretech-ac aka aml-s805x-ac supports mainline U-boot +from a dedicated SPI flash, move the board support into +a dedicated vendor/board subdirectory in order to support +vendor specific customization. + +It also aligns with the vendor downstream changes. + +Link: https://lore.kernel.org/r/20240917-u-boot-topic-dynamic-uuid-v2-1-416e39c6e271@linaro.org +Signed-off-by: Neil Armstrong +--- + board/amlogic/p212/MAINTAINERS | 2 - + board/libre-computer/aml-s805x-ac/MAINTAINERS | 8 ++++ + board/libre-computer/aml-s805x-ac/Makefile | 6 +++ + .../aml-s805x-ac/aml-s805x-ac.c | 47 +++++++++++++++++++ + configs/libretech-ac_defconfig | 2 + + 5 files changed, 63 insertions(+), 2 deletions(-) + create mode 100644 board/libre-computer/aml-s805x-ac/MAINTAINERS + create mode 100644 board/libre-computer/aml-s805x-ac/Makefile + create mode 100644 board/libre-computer/aml-s805x-ac/aml-s805x-ac.c + +diff --git a/board/amlogic/p212/MAINTAINERS b/board/amlogic/p212/MAINTAINERS +index b2e3205fdf0..e73a4e52c1f 100644 +--- a/board/amlogic/p212/MAINTAINERS ++++ b/board/amlogic/p212/MAINTAINERS +@@ -5,11 +5,9 @@ L: u-boot-amlogic@groups.io + F: board/amlogic/p212/ + F: include/configs/p212.h + F: configs/khadas-vim_defconfig +-F: configs/libretech-ac_defconfig + F: configs/libretech-cc_defconfig + F: configs/libretech-cc_v2_defconfig + F: configs/p212_defconfig + F: doc/board/amlogic/p212.rst +-F: doc/board/amlogic/libretech-ac.rst + F: doc/board/amlogic/libretech-cc.rst + F: doc/board/amlogic/khadas-vim.rst +diff --git a/board/libre-computer/aml-s805x-ac/MAINTAINERS b/board/libre-computer/aml-s805x-ac/MAINTAINERS +new file mode 100644 +index 00000000000..7cbc08aeb6c +--- /dev/null ++++ b/board/libre-computer/aml-s805x-ac/MAINTAINERS +@@ -0,0 +1,8 @@ ++LIBRE-COMPUTER AML-S805X-AC ++M: Neil Armstrong ++S: Maintained ++L: u-boot-amlogic@groups.io ++F: board/amlogic/aml-s805x-ac/ ++F: include/configs/libretech-ac.h ++F: configs/libretech-ac_defconfig ++F: doc/board/amlogic/libretech-ac.rst +diff --git a/board/libre-computer/aml-s805x-ac/Makefile b/board/libre-computer/aml-s805x-ac/Makefile +new file mode 100644 +index 00000000000..b4367ea522b +--- /dev/null ++++ b/board/libre-computer/aml-s805x-ac/Makefile +@@ -0,0 +1,6 @@ ++# SPDX-License-Identifier: GPL-2.0+ ++# ++# (C) Copyright 2016 BayLibre, SAS ++# Author: Neil Armstrong ++ ++obj-y := aml-s805x-ac.o +diff --git a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +new file mode 100644 +index 00000000000..ae9834c0bf8 +--- /dev/null ++++ b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +@@ -0,0 +1,47 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2016 BayLibre, SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define EFUSE_SN_OFFSET 20 ++#define EFUSE_SN_SIZE 16 ++#define EFUSE_MAC_OFFSET 52 ++#define EFUSE_MAC_SIZE 6 ++ ++int misc_init_r(void) ++{ ++ u8 mac_addr[EFUSE_MAC_SIZE + 1]; ++ char serial[EFUSE_SN_SIZE + 1]; ++ ssize_t len; ++ ++ if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { ++ len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, ++ mac_addr, EFUSE_MAC_SIZE); ++ mac_addr[len] = '\0'; ++ if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) ++ eth_env_set_enetaddr("ethaddr", mac_addr); ++ else ++ meson_generate_serial_ethaddr(); ++ } ++ ++ if (!env_get("serial#")) { ++ len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, ++ EFUSE_SN_SIZE); ++ serial[len] = '\0'; ++ if (len == EFUSE_SN_SIZE) ++ env_set("serial#", serial); ++ } ++ ++ return 0; ++} +diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig +index 6ad04570022..11d9795e05d 100644 +--- a/configs/libretech-ac_defconfig ++++ b/configs/libretech-ac_defconfig +@@ -1,5 +1,7 @@ + CONFIG_ARM=y + CONFIG_SYS_CONFIG_NAME="libretech-ac" ++CONFIG_SYS_VENDOR="libre-computer" ++CONFIG_SYS_BOARD="aml-s805x-ac" + CONFIG_ARCH_MESON=y + CONFIG_TEXT_BASE=0x01000000 + CONFIG_NR_DRAM_BANKS=1 +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-libre-computer-aml-s805x-cc-Enable-cap.patch b/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-libre-computer-aml-s805x-cc-Enable-cap.patch new file mode 100644 index 0000000000..c7a8c689de --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0004-FROMGIT-board-libre-computer-aml-s805x-cc-Enable-cap.patch @@ -0,0 +1,123 @@ +From 766b23d9252d70c2e193876c7cc8b5cca954cba7 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Tue, 17 Sep 2024 14:34:46 +0200 +Subject: [PATCH 04/12] FROMGIT: board: libre-computer: aml-s805x-cc: Enable + capsule updates + +Since the aml-s805-cc works well using EFI, and now the capsule updates +backend has been merged, let's enable the missing configs and add +the required structures to support it. + +The GUID is dynamically generated for the board, to get it: +=> efidebug capsule esrt +======================================== +ESRT: fw_resource_count=1 +ESRT: fw_resource_count_max=1 +ESRT: fw_resource_version=1 +[entry 0]============================== +ESRT: fw_class=B8079027-9B2C-57D4-86AA-CC782ADA598C +ESRT: fw_type=unknown +ESRT: fw_version=0 +ESRT: lowest_supported_fw_version=0 +ESRT: capsule_flags=0 +ESRT: last_attempt_version=0 +ESRT: last_attempt_status=success +======================================== + +On the host (with the aml_encrypt_gxl result binary): +$ eficapsule --guid B8079027-9B2C-57D4-86AA-CC782ADA598C -i 1 u-boot.bin u-boot.cap + +On the board (from USB disk containing u-boot.cap at root): +=> load usb 0:1 $kernel_addr_r u-boot.cap +=> efidebug capsule update $kernel_addr_r + +The binary will then be flashed on the SPI. + +Reviewed-by: Ilias Apalodimas +Link: https://lore.kernel.org/r/20240917-u-boot-topic-dynamic-uuid-v2-2-416e39c6e271@linaro.org +Signed-off-by: Neil Armstrong +--- + .../aml-s805x-ac/aml-s805x-ac.c | 24 +++++++++++++++++++ + configs/libretech-ac_defconfig | 6 +++++ + 2 files changed, 30 insertions(+) + +diff --git a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +index ae9834c0bf8..94cf5b4361f 100644 +--- a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c ++++ b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -19,6 +20,29 @@ + #define EFUSE_MAC_OFFSET 52 + #define EFUSE_MAC_SIZE 6 + ++struct efi_fw_image fw_images[] = { ++ { ++ .fw_name = u"AML_S805X_AC_BOOT", ++ .image_index = 1, ++ }, ++}; ++ ++struct efi_capsule_update_info update_info = { ++ .dfu_string = "sf 0:0=u-boot-bin raw 0 0x10000", ++ .num_images = ARRAY_SIZE(fw_images), ++ .images = fw_images, ++}; ++ ++#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) ++void set_dfu_alt_info(char *interface, char *devstr) ++{ ++ if (strcmp(interface, "ram") == 0) ++ env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); ++ else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) ++ env_set("dfu_alt_info", update_info.dfu_string); ++} ++#endif ++ + int misc_init_r(void) + { + u8 mac_addr[EFUSE_MAC_SIZE + 1]; +diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig +index 11d9795e05d..7763a14f203 100644 +--- a/configs/libretech-ac_defconfig ++++ b/configs/libretech-ac_defconfig +@@ -35,6 +35,7 @@ CONFIG_SYS_MAXARGS=32 + # CONFIG_CMD_IMI is not set + CONFIG_CMD_ADC=y + CONFIG_CMD_DFU=y ++CONFIG_CMD_NVEDIT_EFI=y + CONFIG_CMD_GPIO=y + # CONFIG_CMD_LOADS is not set + CONFIG_CMD_MMC=y +@@ -42,6 +43,7 @@ CONFIG_CMD_SF_TEST=y + CONFIG_CMD_SPI=y + CONFIG_CMD_USB=y + CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_EFIDEBUG=y + # CONFIG_CMD_SETEXPR is not set + CONFIG_CMD_REGULATOR=y + CONFIG_OF_CONTROL=y +@@ -49,6 +51,8 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y + CONFIG_SYS_RELOC_GD_ENV_ADDR=y + CONFIG_SARADC_MESON=y + CONFIG_DFU_RAM=y ++CONFIG_DFU_SF=y ++CONFIG_SET_DFU_ALT_INFO=y + CONFIG_MMC_MESON_GX=y + CONFIG_MTD=y + CONFIG_DM_MTD=y +@@ -98,3 +102,5 @@ CONFIG_VIDEO_BMP_RLE8=y + CONFIG_BMP_16BPP=y + CONFIG_BMP_24BPP=y + CONFIG_BMP_32BPP=y ++CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y ++CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch b/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch new file mode 100644 index 0000000000..ec0a35b190 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0005-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch @@ -0,0 +1,337 @@ +From b62cecc1151de8e1d5f694d03c00fff67ceee4ec Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Fri, 20 Sep 2024 15:33:33 +0200 +Subject: [PATCH 05/12] FROMGIT: ARM: meson: add support for Libre Computer + aml-a311d-cc + +Add support for the Libre Computer aml-a311d-cc "Alta" board: +https://libre.computer/products/aml-a311d-cc/ + +The Alta board has a Credit Card form factor, similar to the +the prvevious "Le Potato" card, but with the Amlogic A311D SoC, +MIPI DSI and CSI connectors. PoE header and a single USB2 Type-C +connector replacing the microUSB one for power and USB 2.0. + +The board has an embedded SPI NOR flash, and EFI Capsule support +is added. + +The GUID is dynamically generated for the board, to get it: +=> efidebug capsule esrt +======================================== +ESRT: fw_resource_count=1 +ESRT: fw_resource_count_max=1 +ESRT: fw_resource_version=1 +[entry 0]============================== +ESRT: fw_class=17E07D9D-4D91-53F4-8780-1D91F279C1A5 +ESRT: fw_type=unknown +ESRT: fw_version=0 +ESRT: lowest_supported_fw_version=0 +ESRT: capsule_flags=0 +ESRT: last_attempt_version=0 +ESRT: last_attempt_status=success +======================================== + +On the host (with the aml_encrypt_g12a result binary): +$ eficapsule --guid 17E07D9D-4D91-53F4-8780-1D91F279C1A5 -i 1 u-boot.bin u-boot.cap + +On the board (from USB disk containing u-boot.cap at root): +=> load usb 0:1 $kernel_addr_r u-boot.cap +=> efidebug capsule update $kernel_addr_r + +The binary will then be flashed on the SPI. + +Link: https://lore.kernel.org/r/20240920-u-boot-topic-libre-computer-solitude-alta-v1-1-8915b108840b@linaro.org +Signed-off-by: Neil Armstrong +--- + .../meson-g12b-a311d-libretech-cc-u-boot.dtsi | 15 +++ + board/libre-computer/aml-a311d-cc/MAINTAINERS | 7 ++ + board/libre-computer/aml-a311d-cc/Makefile | 6 + + .../aml-a311d-cc/aml-a311d-cc.c | 44 +++++++ + configs/aml-a311d-cc_defconfig | 108 ++++++++++++++++++ + doc/board/amlogic/aml-a311d-cc.rst | 46 ++++++++ + doc/board/amlogic/index.rst | 1 + + 7 files changed, 227 insertions(+) + create mode 100644 arch/arm/dts/meson-g12b-a311d-libretech-cc-u-boot.dtsi + create mode 100644 board/libre-computer/aml-a311d-cc/MAINTAINERS + create mode 100644 board/libre-computer/aml-a311d-cc/Makefile + create mode 100644 board/libre-computer/aml-a311d-cc/aml-a311d-cc.c + create mode 100644 configs/aml-a311d-cc_defconfig + create mode 100644 doc/board/amlogic/aml-a311d-cc.rst + +diff --git a/arch/arm/dts/meson-g12b-a311d-libretech-cc-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-libretech-cc-u-boot.dtsi +new file mode 100644 +index 00000000000..cbada739042 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-a311d-libretech-cc-u-boot.dtsi +@@ -0,0 +1,15 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" ++ ++&sd_emmc_c { ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>; ++ bus-width = <4>; ++}; ++ ++&spifc { ++ status = "okay"; ++}; +diff --git a/board/libre-computer/aml-a311d-cc/MAINTAINERS b/board/libre-computer/aml-a311d-cc/MAINTAINERS +new file mode 100644 +index 00000000000..b4b77acd23b +--- /dev/null ++++ b/board/libre-computer/aml-a311d-cc/MAINTAINERS +@@ -0,0 +1,7 @@ ++LIBRE-COMPUTER AML-A311D-CC ++M: Neil Armstrong ++S: Maintained ++L: u-boot-amlogic@groups.io ++F: board/amlogic/aml-a311d-cc/ ++F: configs/aml-a311d-cc_defconfig ++F: doc/board/amlogic/aml-a311d-cc.rst +diff --git a/board/libre-computer/aml-a311d-cc/Makefile b/board/libre-computer/aml-a311d-cc/Makefile +new file mode 100644 +index 00000000000..461955def3a +--- /dev/null ++++ b/board/libre-computer/aml-a311d-cc/Makefile +@@ -0,0 +1,6 @@ ++# SPDX-License-Identifier: GPL-2.0+ ++# ++# (C) Copyright 2016 BayLibre, SAS ++# Author: Neil Armstrong ++ ++obj-y := aml-a311d-cc.o +diff --git a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c +new file mode 100644 +index 00000000000..e45cfd5d8a3 +--- /dev/null ++++ b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c +@@ -0,0 +1,44 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2016 BayLibre, SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct efi_fw_image fw_images[] = { ++ { ++ .fw_name = u"AML_A311D_CC_BOOT", ++ .image_index = 1, ++ }, ++}; ++ ++struct efi_capsule_update_info update_info = { ++ .dfu_string = "sf 0:0=u-boot-bin raw 0 0x10000", ++ .num_images = ARRAY_SIZE(fw_images), ++ .images = fw_images, ++}; ++ ++ ++#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) ++void set_dfu_alt_info(char *interface, char *devstr) ++{ ++ if (strcmp(interface, "ram") == 0) ++ env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); ++ else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) ++ env_set("dfu_alt_info", update_info.dfu_string); ++} ++#endif ++ ++int misc_init_r(void) ++{ ++ meson_generate_serial_ethaddr(); ++ ++ return 0; ++} +diff --git a/configs/aml-a311d-cc_defconfig b/configs/aml-a311d-cc_defconfig +new file mode 100644 +index 00000000000..c8e22200419 +--- /dev/null ++++ b/configs/aml-a311d-cc_defconfig +@@ -0,0 +1,108 @@ ++CONFIG_ARM=y ++CONFIG_SYS_VENDOR="libre-computer" ++CONFIG_SYS_BOARD="aml-a311d-cc" ++CONFIG_ARCH_MESON=y ++CONFIG_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_ENV_OFFSET=0xFFFF0000 ++CONFIG_ENV_SECT_SIZE=0x10000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-g12b-a311d-libretech-cc" ++CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_DM_RESET=y ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING="aml-a311d-cc" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_REMAKE_ELF=y ++CONFIG_FIT=y ++CONFIG_FIT_SIGNATURE=y ++CONFIG_FIT_VERBOSE=y ++CONFIG_LEGACY_IMAGE_FORMAT=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_DFU=y ++CONFIG_CMD_NVEDIT_EFI=y ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_SF_TEST=y ++CONFIG_CMD_SPI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_EFIDEBUG=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_ENV_IS_IN_SPI_FLASH=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ADC=y ++CONFIG_SARADC_MESON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_ADC=y ++CONFIG_DFU_RAM=y ++CONFIG_DFU_SF=y ++CONFIG_SET_DFU_ALT_INFO=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_DM_SPI_FLASH=y ++CONFIG_SPI_FLASH_GIGADEVICE=y ++CONFIG_SPI_FLASH_SPANSION=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MESON_G12A=y ++CONFIG_MESON_G12A_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_G12A=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_EE_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_SPI=y ++CONFIG_DM_SPI=y ++CONFIG_MESON_SPIFC=y ++CONFIG_SYSINFO=y ++CONFIG_SYSINFO_SMBIOS=y ++CONFIG_USB=y ++CONFIG_DM_USB_GADGET=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_G12A=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_DWC2_OTG_PHY_BUS_WIDTH_8=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_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_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 ++CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y ++CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y +diff --git a/doc/board/amlogic/aml-a311d-cc.rst b/doc/board/amlogic/aml-a311d-cc.rst +new file mode 100644 +index 00000000000..25c1e01906a +--- /dev/null ++++ b/doc/board/amlogic/aml-a311d-cc.rst +@@ -0,0 +1,46 @@ ++.. SPDX-License-Identifier: GPL-2.0+ ++ ++U-Boot for Libre Computer AML-A311D-CC 'Alta' (A311D) ++===================================================== ++ ++AML-A311D-CC is a Single Board Computer manufactured by Libre Computer Technology with ++the following specifications: ++ ++ - Amlogic A311D Arm Cortex-A53 dual-core + Cortex-A73 quad-core SoC ++ - 2 or 4GB LPDDR4 SDRAM ++ - Gigabit Ethernet ++ - HDMI 2.1 display ++ - 40-pin GPIO header ++ - 4 x USB 3.0 Host, 1 x USB 2.0 Type-C ++ - eMMC 5.x SM Interface for Libre Computer Modules ++ - microSD ++ - Infrared receiver ++ ++Schematics are available on the manufacturer website. ++ ++U-Boot Compilation ++------------------ ++ ++.. code-block:: bash ++ ++ $ export CROSS_COMPILE=aarch64-none-elf- ++ $ make aml-a311d-cc_defconfig ++ $ make ++ ++U-Boot Signing with Pre-Built FIP repo ++-------------------------------------- ++ ++.. code-block:: bash ++ ++ $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1 ++ $ cd amlogic-boot-fip ++ $ mkdir my-output-dir ++ $ ./build-fip.sh aml-a311d-cc /path/to/u-boot/u-boot.bin my-output-dir ++ ++Then write U-Boot to SD or eMMC with: ++ ++.. code-block:: bash ++ ++ $ DEV=/dev/boot_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 46f44bf34ec..de91b21f977 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -85,6 +85,7 @@ Board Documentation + .. toctree:: + :maxdepth: 1 + ++ aml-a311d-cc + bananapi-cm4io + bananapi-m2pro + bananapi-m2s +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch b/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch new file mode 100644 index 0000000000..240ac95d0b --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0006-FROMGIT-ARM-meson-add-support-for-Libre-Computer-aml.patch @@ -0,0 +1,337 @@ +From b2b6496c521a9299aec3e0114595a90894bd1ccd Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Fri, 20 Sep 2024 15:33:34 +0200 +Subject: [PATCH 06/12] FROMGIT: ARM: meson: add support for Libre Computer + aml-s905d3-cc + +Add support for the Libre Computer aml-s905d3-cc "Solitude" board: +https://libre.computer/products/aml-s905d3-cc/ + +The Solitude board has a Credit Card form factor, similar to the +the previous "Le Potato" card, but with the Amlogic A311D SoC, +MIPI DSI and CSI connectors. PoE header and a single USB2 Type-C +connector replacing the microUSB one for power and USB 2.0. + +The board has an embedded SPI NOR flash, and EFI Capsule support +is added. + +The GUID is dynamically generated for the board, to get it: +=> efidebug capsule esrt +======================================== +ESRT: fw_resource_count=1 +ESRT: fw_resource_count_max=1 +ESRT: fw_resource_version=1 +[entry 0]============================== +ESRT: fw_class=4302C3CB-2502-5EFE-87E0-894A8A322893 +ESRT: fw_type=unknown +ESRT: fw_version=0 +ESRT: lowest_supported_fw_version=0 +ESRT: capsule_flags=0 +ESRT: last_attempt_version=0 +ESRT: last_attempt_status=success +======================================== + +On the host (with the aml_encrypt_g12a result binary): +$ eficapsule --guid 4302C3CB-2502-5EFE-87E0-894A8A322893 -i 1 u-boot.bin u-boot.cap + +On the board (from USB disk containing u-boot.cap at root): +=> load usb 0:1 $kernel_addr_r u-boot.cap +=> efidebug capsule update $kernel_addr_r + +The binary will then be flashed on the SPI. + +Link: https://lore.kernel.org/r/20240920-u-boot-topic-libre-computer-solitude-alta-v1-2-8915b108840b@linaro.org +Signed-off-by: Neil Armstrong +--- + .../meson-sm1-s905d3-libretech-cc-u-boot.dtsi | 15 +++ + .../libre-computer/aml-s905d3-cc/MAINTAINERS | 7 ++ + board/libre-computer/aml-s905d3-cc/Makefile | 6 + + .../aml-s905d3-cc/aml-s905d3-cc.c | 44 +++++++ + configs/aml-s905d3-cc_defconfig | 108 ++++++++++++++++++ + doc/board/amlogic/aml-s905d3-cc.rst | 46 ++++++++ + doc/board/amlogic/index.rst | 1 + + 7 files changed, 227 insertions(+) + create mode 100644 arch/arm/dts/meson-sm1-s905d3-libretech-cc-u-boot.dtsi + create mode 100644 board/libre-computer/aml-s905d3-cc/MAINTAINERS + create mode 100644 board/libre-computer/aml-s905d3-cc/Makefile + create mode 100644 board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c + create mode 100644 configs/aml-s905d3-cc_defconfig + create mode 100644 doc/board/amlogic/aml-s905d3-cc.rst + +diff --git a/arch/arm/dts/meson-sm1-s905d3-libretech-cc-u-boot.dtsi b/arch/arm/dts/meson-sm1-s905d3-libretech-cc-u-boot.dtsi +new file mode 100644 +index 00000000000..1c4f019120f +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-s905d3-libretech-cc-u-boot.dtsi +@@ -0,0 +1,15 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" ++ ++&sd_emmc_c { ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_4b_pins>, <&emmc_ds_pins>; ++ bus-width = <4>; ++}; ++ ++&spifc { ++ status = "okay"; ++}; +diff --git a/board/libre-computer/aml-s905d3-cc/MAINTAINERS b/board/libre-computer/aml-s905d3-cc/MAINTAINERS +new file mode 100644 +index 00000000000..4b75c815c07 +--- /dev/null ++++ b/board/libre-computer/aml-s905d3-cc/MAINTAINERS +@@ -0,0 +1,7 @@ ++LIBRE-COMPUTER AML-S905D3-CC ++M: Neil Armstrong ++S: Maintained ++L: u-boot-amlogic@groups.io ++F: board/amlogic/aml-s905d3-cc/ ++F: configs/aml-s905d3-cc_defconfig ++F: doc/board/amlogic/aml-s905d3-cc.rst +diff --git a/board/libre-computer/aml-s905d3-cc/Makefile b/board/libre-computer/aml-s905d3-cc/Makefile +new file mode 100644 +index 00000000000..7d2c41e6436 +--- /dev/null ++++ b/board/libre-computer/aml-s905d3-cc/Makefile +@@ -0,0 +1,6 @@ ++# SPDX-License-Identifier: GPL-2.0+ ++# ++# (C) Copyright 2016 BayLibre, SAS ++# Author: Neil Armstrong ++ ++obj-y := aml-s905d3-cc.o +diff --git a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c +new file mode 100644 +index 00000000000..f641db5a494 +--- /dev/null ++++ b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c +@@ -0,0 +1,44 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (C) 2016 BayLibre, SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++struct efi_fw_image fw_images[] = { ++ { ++ .fw_name = u"AML_S905D3_CC_BOOT", ++ .image_index = 1, ++ }, ++}; ++ ++struct efi_capsule_update_info update_info = { ++ .dfu_string = "sf 0:0=u-boot-bin raw 0 0x10000", ++ .num_images = ARRAY_SIZE(fw_images), ++ .images = fw_images, ++}; ++ ++ ++#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) ++void set_dfu_alt_info(char *interface, char *devstr) ++{ ++ if (strcmp(interface, "ram") == 0) ++ env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); ++ else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) ++ env_set("dfu_alt_info", update_info.dfu_string); ++} ++#endif ++ ++int misc_init_r(void) ++{ ++ meson_generate_serial_ethaddr(); ++ ++ return 0; ++} +diff --git a/configs/aml-s905d3-cc_defconfig b/configs/aml-s905d3-cc_defconfig +new file mode 100644 +index 00000000000..a6e5d584c0a +--- /dev/null ++++ b/configs/aml-s905d3-cc_defconfig +@@ -0,0 +1,108 @@ ++CONFIG_ARM=y ++CONFIG_SYS_VENDOR="libre-computer" ++CONFIG_SYS_BOARD="aml-s905d3-cc" ++CONFIG_ARCH_MESON=y ++CONFIG_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_ENV_OFFSET=0xFFFF0000 ++CONFIG_ENV_SECT_SIZE=0x10000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-sm1-s905d3-libretech-cc" ++CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_DM_RESET=y ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING="aml-s905d3-cc" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_REMAKE_ELF=y ++CONFIG_FIT=y ++CONFIG_FIT_SIGNATURE=y ++CONFIG_FIT_VERBOSE=y ++CONFIG_LEGACY_IMAGE_FORMAT=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_DFU=y ++CONFIG_CMD_NVEDIT_EFI=y ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_SF_TEST=y ++CONFIG_CMD_SPI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_EFIDEBUG=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_ENV_IS_IN_SPI_FLASH=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ADC=y ++CONFIG_SARADC_MESON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_ADC=y ++CONFIG_DFU_RAM=y ++CONFIG_DFU_SF=y ++CONFIG_SET_DFU_ALT_INFO=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_DM_SPI_FLASH=y ++CONFIG_SPI_FLASH_GIGADEVICE=y ++CONFIG_SPI_FLASH_SPANSION=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MESON_G12A=y ++CONFIG_MESON_G12A_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_G12A=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_EE_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_SPI=y ++CONFIG_DM_SPI=y ++CONFIG_MESON_SPIFC=y ++CONFIG_SYSINFO=y ++CONFIG_SYSINFO_SMBIOS=y ++CONFIG_USB=y ++CONFIG_DM_USB_GADGET=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_G12A=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_DWC2_OTG_PHY_BUS_WIDTH_8=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_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_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 ++CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y ++CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y +diff --git a/doc/board/amlogic/aml-s905d3-cc.rst b/doc/board/amlogic/aml-s905d3-cc.rst +new file mode 100644 +index 00000000000..083a591fc52 +--- /dev/null ++++ b/doc/board/amlogic/aml-s905d3-cc.rst +@@ -0,0 +1,46 @@ ++.. SPDX-License-Identifier: GPL-2.0+ ++ ++U-Boot for Libre Computer AML-S905D3-CC 'Solitude' (S905D3) ++=========================================================== ++ ++AML-S905D3-CC is a Single Board Computer manufactured by Libre Computer Technology with ++the following specifications: ++ ++ - Amlogic S905D3 Cortex-A55 quad-core SoC ++ - 2 or 4GB LPDDR4 SDRAM ++ - Gigabit Ethernet ++ - HDMI 2.1 display ++ - 40-pin GPIO header ++ - 4 x USB 3.0 Host, 1 x USB 2.0 Type-C ++ - eMMC 5.x SM Interface for Libre Computer Modules ++ - microSD ++ - Infrared receiver ++ ++Schematics are available on the manufacturer website. ++ ++U-Boot Compilation ++------------------ ++ ++.. code-block:: bash ++ ++ $ export CROSS_COMPILE=aarch64-none-elf- ++ $ make aml-s905d3-cc_defconfig ++ $ make ++ ++U-Boot Signing with Pre-Built FIP repo ++-------------------------------------- ++ ++.. code-block:: bash ++ ++ $ git clone https://github.com/LibreELEC/amlogic-boot-fip --depth=1 ++ $ cd amlogic-boot-fip ++ $ mkdir my-output-dir ++ $ ./build-fip.sh aml-s905d3-cc /path/to/u-boot/u-boot.bin my-output-dir ++ ++Then write U-Boot to SD or eMMC with: ++ ++.. code-block:: bash ++ ++ $ DEV=/dev/boot_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 de91b21f977..dcd935224ac 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -86,6 +86,7 @@ Board Documentation + :maxdepth: 1 + + aml-a311d-cc ++ aml-s905d3-cc + bananapi-cm4io + bananapi-m2pro + bananapi-m2s +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-dts-meson-g12-common-u-boot-do-not-disable-c.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-dts-meson-g12-common-u-boot-do-not-disable-c.patch new file mode 100644 index 0000000000..d8785f8797 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-FROMGIT-dts-meson-g12-common-u-boot-do-not-disable-c.patch @@ -0,0 +1,33 @@ +From 2089ed103a91fa226af44bd6c72a14e7066277aa Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Tue, 8 Oct 2024 18:23:42 +0200 +Subject: [PATCH 07/12] FROMGIT: dts: meson-g12-common-u-boot: do not disable + canvas + +We were disabling canvas, which causes meson vpu probe failure, +just stop and leave canvas alone. + +Fixes: ce9fa7bffc5 ("ARM: dts: meson-g12a: add U-Boot specific DT for graphics") +Signed-off-by: Neil Armstrong +--- + arch/arm/dts/meson-g12-common-u-boot.dtsi | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi +index 8070b62af5b..6629f3256a8 100644 +--- a/arch/arm/dts/meson-g12-common-u-boot.dtsi ++++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi +@@ -17,10 +17,6 @@ + }; + }; + +-&canvas { +- status = "disabled"; +-}; +- + &vpu { + reg = <0x0 0xff900000 0x0 0x100000>, + <0x0 0xff63c000 0x0 0x1000>, +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-FROMGIT-video-meson-dw-hdmi-do-not-fail-probe-if-HDM.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-FROMGIT-video-meson-dw-hdmi-do-not-fail-probe-if-HDM.patch new file mode 100644 index 0000000000..5fbee18f84 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-FROMGIT-video-meson-dw-hdmi-do-not-fail-probe-if-HDM.patch @@ -0,0 +1,35 @@ +From 3afcf6403a22a276be297d57ed1af9342510ea3b Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 9 Oct 2024 10:01:56 +0200 +Subject: [PATCH 08/12] FROMGIT: video: meson: dw-hdmi: do not fail probe if + HDMI regulator is already enabled + +If the regulator is already enabled, this happens if the regulator +is set in regulator-always-on, regulator_set_enable() return -EALREADY. + +Ignore the -EALREADY return since it's not an error. + +Suggested-by: Jonas Karlman +Signed-off-by: Neil Armstrong +--- + drivers/video/meson/meson_dw_hdmi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/meson/meson_dw_hdmi.c b/drivers/video/meson/meson_dw_hdmi.c +index 587df7beb9b..1631dc38416 100644 +--- a/drivers/video/meson/meson_dw_hdmi.c ++++ b/drivers/video/meson/meson_dw_hdmi.c +@@ -418,8 +418,8 @@ static int meson_dw_hdmi_probe(struct udevice *dev) + } + + if (!ret) { +- ret = regulator_set_enable(supply, true); +- if (ret) ++ ret = regulator_set_enable_if_allowed(supply, true); ++ if (ret && ret != -ENOSYS) + return ret; + } + #endif +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-FROMGIT-clk-meson-gxbb-add-HDMI-clocks.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-FROMGIT-clk-meson-gxbb-add-HDMI-clocks.patch new file mode 100644 index 0000000000..578ee73ffa --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0009-FROMGIT-clk-meson-gxbb-add-HDMI-clocks.patch @@ -0,0 +1,169 @@ +From 0af7ea971441f33a16e2b669a43c08878ec9615a Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 9 Oct 2024 11:15:20 +0200 +Subject: [PATCH 09/12] FROMGIT: clk: meson: gxbb: add HDMI clocks + +Align with g12a driver to handle the CLKID_HDMI, CLKID_HDMI_SEL +and CLKID_HDMI_DIV clocks since they were added to the upstream +GXBB/GXL Devicetree on v6.11 with [1] + +[1] https://lore.kernel.org/all/20240626152733.1350376-1-jbrunet@baylibre.com/ + +Signed-off-by: Neil Armstrong +--- + drivers/clk/meson/gxbb.c | 50 +++++++++++++++++++++++++++++++++++++++- + 1 file changed, 49 insertions(+), 1 deletion(-) + +diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c +index 72ad4fd0e85..51f124869c9 100644 +--- a/drivers/clk/meson/gxbb.c ++++ b/drivers/clk/meson/gxbb.c +@@ -66,6 +66,8 @@ + #define CLKID_VDEC_HEVC_SEL 154 + #define CLKID_VDEC_HEVC_DIV 155 + ++#define CLKID_XTAL 0x10000000 ++ + #define XTAL_RATE 24000000 + + struct meson_clk { +@@ -192,6 +194,7 @@ static struct meson_gate gates[] = { + MESON_GATE(CLKID_VAPB_0, HHI_VAPBCLK_CNTL, 8), + MESON_GATE(CLKID_VAPB_1, HHI_VAPBCLK_CNTL, 24), + MESON_GATE(CLKID_VAPB, HHI_VAPBCLK_CNTL, 30), ++ MESON_GATE(CLKID_HDMI, HHI_HDMI_CLK_CNTL, 8), + }; + + static int meson_set_gate_by_id(struct clk *clk, unsigned long id, bool on) +@@ -267,6 +270,12 @@ static struct parm meson_vapb_1_div_parm = { + + int meson_vapb_1_div_parent = CLKID_VAPB_1_SEL; + ++static struct parm meson_hdmi_div_parm = { ++ HHI_HDMI_CLK_CNTL, 0, 7, ++}; ++ ++int meson_hdmi_div_parent = CLKID_HDMI_SEL; ++ + static ulong meson_div_get_rate(struct clk *clk, unsigned long id) + { + struct meson_clk *priv = dev_get_priv(clk->dev); +@@ -292,6 +301,10 @@ static ulong meson_div_get_rate(struct clk *clk, unsigned long id) + parm = &meson_vapb_1_div_parm; + parent = meson_vapb_1_div_parent; + break; ++ case CLKID_HDMI_DIV: ++ parm = &meson_hdmi_div_parm; ++ parent = meson_hdmi_div_parent; ++ break; + default: + return -ENOENT; + } +@@ -347,6 +360,10 @@ static ulong meson_div_set_rate(struct clk *clk, unsigned long id, ulong rate, + parm = &meson_vapb_1_div_parm; + parent = meson_vapb_1_div_parent; + break; ++ case CLKID_HDMI_DIV: ++ parm = &meson_hdmi_div_parm; ++ parent = meson_hdmi_div_parent; ++ break; + default: + return -ENOENT; + } +@@ -443,6 +460,17 @@ static int meson_vapb_0_1_mux_parents[] = { + CLKID_FCLK_DIV7, + }; + ++static struct parm meson_hdmi_mux_parm = { ++ HHI_HDMI_CLK_CNTL, 9, 2, ++}; ++ ++static int meson_hdmi_mux_parents[] = { ++ CLKID_XTAL, ++ CLKID_FCLK_DIV4, ++ CLKID_FCLK_DIV3, ++ CLKID_FCLK_DIV5, ++}; ++ + static ulong meson_mux_get_parent(struct clk *clk, unsigned long id) + { + struct meson_clk *priv = dev_get_priv(clk->dev); +@@ -475,6 +503,10 @@ static ulong meson_mux_get_parent(struct clk *clk, unsigned long id) + parm = &meson_vapb_1_mux_parm; + parents = meson_vapb_0_1_mux_parents; + break; ++ case CLKID_HDMI_SEL: ++ parm = &meson_hdmi_mux_parm; ++ parents = meson_hdmi_mux_parents; ++ break; + default: + return -ENOENT; + } +@@ -532,6 +564,10 @@ static ulong meson_mux_set_parent(struct clk *clk, unsigned long id, + parm = &meson_vapb_1_mux_parm; + parents = meson_vapb_0_1_mux_parents; + break; ++ case CLKID_HDMI_SEL: ++ parm = &meson_hdmi_mux_parm; ++ parents = meson_hdmi_mux_parents; ++ break; + default: + /* Not a mux */ + return -ENOENT; +@@ -572,7 +608,7 @@ static unsigned long meson_clk81_get_rate(struct clk *clk) + unsigned long parent_rate; + uint reg; + int parents[] = { +- -1, ++ CLKID_XTAL, + -1, + CLKID_FCLK_DIV7, + CLKID_MPLL1, +@@ -727,6 +763,9 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk, unsigned long id) + ulong rate; + + switch (id) { ++ case CLKID_XTAL: ++ rate = XTAL_RATE; ++ break; + case CLKID_FIXED_PLL: + case CLKID_SYS_PLL: + rate = meson_pll_get_rate(clk, id); +@@ -769,10 +808,14 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk, unsigned long id) + case CLKID_VAPB_1: + rate = meson_div_get_rate(clk, CLKID_VAPB_1_DIV); + break; ++ case CLKID_HDMI: ++ rate = meson_div_get_rate(clk, CLKID_HDMI_DIV); ++ break; + case CLKID_VPU_0_DIV: + case CLKID_VPU_1_DIV: + case CLKID_VAPB_0_DIV: + case CLKID_VAPB_1_DIV: ++ case CLKID_HDMI_DIV: + rate = meson_div_get_rate(clk, id); + break; + case CLKID_VPU: +@@ -781,6 +824,7 @@ static ulong meson_clk_get_rate_by_id(struct clk *clk, unsigned long id) + case CLKID_VAPB_SEL: + case CLKID_VAPB_0_SEL: + case CLKID_VAPB_1_SEL: ++ case CLKID_HDMI_SEL: + rate = meson_mux_get_rate(clk, id); + break; + default: +@@ -851,7 +895,11 @@ static ulong meson_clk_set_rate_by_id(struct clk *clk, unsigned long id, + case CLKID_VPU_1_DIV: + case CLKID_VAPB_0_DIV: + case CLKID_VAPB_1_DIV: ++ case CLKID_HDMI_DIV: + return meson_div_set_rate(clk, id, rate, current_rate); ++ case CLKID_HDMI: ++ return meson_clk_set_rate_by_id(clk, CLKID_HDMI_DIV, ++ rate, current_rate); + default: + return -ENOENT; + } +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0010-FROMGIT-power-domain-meson-ee-pwrc-make-sure-to-not-.patch b/projects/Amlogic/patches/u-boot/u-boot-0010-FROMGIT-power-domain-meson-ee-pwrc-make-sure-to-not-.patch new file mode 100644 index 0000000000..dd8962b64d --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0010-FROMGIT-power-domain-meson-ee-pwrc-make-sure-to-not-.patch @@ -0,0 +1,67 @@ +From 1698107823f718396364641b24a2ee9ae5f3c862 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 9 Oct 2024 11:15:21 +0200 +Subject: [PATCH 10/12] FROMGIT: power/domain: meson-ee-pwrc: make sure to not + enable a domain twice + +The upstream Device Tree for GXBB/GXL/G12A was updated with VPU domain +shared between the VPU and HDMI node, causing a double enable. + +Simply store the enable state and avoid enabling twice, fixing +HDMI output on all platforms. + +Signed-off-by: Neil Armstrong +--- + drivers/power/domain/meson-ee-pwrc.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c +index 20e9f32b381..4d9f3bba644 100644 +--- a/drivers/power/domain/meson-ee-pwrc.c ++++ b/drivers/power/domain/meson-ee-pwrc.c +@@ -60,6 +60,7 @@ struct meson_ee_pwrc_domain_desc { + unsigned int mem_pd_count; + struct meson_ee_pwrc_mem_domain *mem_pd; + bool (*get_power)(struct power_domain *power_domain); ++ bool enabled; + }; + + struct meson_ee_pwrc_domain_data { +@@ -306,6 +307,8 @@ static int meson_ee_pwrc_off(struct power_domain *power_domain) + clk_disable_bulk(&priv->clks); + } + ++ pwrc_domain->enabled = false; ++ + return 0; + } + +@@ -317,6 +320,9 @@ static int meson_ee_pwrc_on(struct power_domain *power_domain) + + pwrc_domain = &priv->data->domains[power_domain->id]; + ++ if (pwrc_domain->enabled) ++ return 0; ++ + if (pwrc_domain->top_pd) + regmap_update_bits(priv->regmap_ao, + pwrc_domain->top_pd->sleep_reg, +@@ -347,8 +353,13 @@ static int meson_ee_pwrc_on(struct power_domain *power_domain) + return ret; + } + +- if (pwrc_domain->clk_names_count) +- return clk_enable_bulk(&priv->clks); ++ if (pwrc_domain->clk_names_count) { ++ ret = clk_enable_bulk(&priv->clks); ++ if (ret) ++ return ret; ++ } ++ ++ pwrc_domain->enabled = true; + + return 0; + } +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-FROMGIT-configs-meson64-Ensure-commands-for-boot-tar.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-FROMGIT-configs-meson64-Ensure-commands-for-boot-tar.patch new file mode 100644 index 0000000000..29491b6cd1 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0011-FROMGIT-configs-meson64-Ensure-commands-for-boot-tar.patch @@ -0,0 +1,79 @@ +From b4ca194c66389e2d9f27d3346e93f856aff9120b Mon Sep 17 00:00:00 2001 +From: Callum Parsey +Date: Sat, 12 Oct 2024 08:03:51 +0000 +Subject: [PATCH 11/12] FROMGIT: configs: meson64: Ensure commands for boot + targets are available + +When populating BOOT_TARGET_DEVICES on Amlogic Meson platforms, verify +that the shell commands for accessing the relevant media have been +enabled in the build configuration. + +This was already being done for USB, NVME and SCSI devices, but not +for MMC devices or network boot. This meant that configuring U-Boot +without the networking or MMC subsystems/drivers would cause an error +to be thrown during preprocessing. + +Signed-off-by: Callum Parsey +Reviewed-by: Neil Armstrong +Link: https://lore.kernel.org/r/20241012080340.2596-1-callum@neoninteger.au +Signed-off-by: Neil Armstrong +--- + include/configs/meson64.h | 28 +++++++++++++++++++++++----- + 1 file changed, 23 insertions(+), 5 deletions(-) + +diff --git a/include/configs/meson64.h b/include/configs/meson64.h +index 8b6f8159e78..72d3caa30be 100644 +--- a/include/configs/meson64.h ++++ b/include/configs/meson64.h +@@ -77,6 +77,15 @@ + #define BOOTENV_DEV_NAME_USB_DFU(devtypeu, devtypel, instance) + #endif + ++#ifdef CONFIG_CMD_MMC ++ #define BOOT_TARGET_MMC(func) \ ++ func(MMC, mmc, 0) \ ++ func(MMC, mmc, 1) \ ++ func(MMC, mmc, 2) ++#else ++ #define BOOT_TARGET_MMC(func) ++#endif ++ + #ifdef CONFIG_CMD_USB + #define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) + #else +@@ -95,18 +104,27 @@ + #define BOOT_TARGET_SCSI(func) + #endif + ++#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE) ++ #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) ++ #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) ++#elif defined(CONFIG_CMD_DHCP) ++ #define BOOT_TARGET_PXE(func) ++ #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) ++#else ++ #define BOOT_TARGET_PXE(func) ++ #define BOOT_TARGET_DHCP(func) ++#endif ++ + #ifndef BOOT_TARGET_DEVICES + #define BOOT_TARGET_DEVICES(func) \ + func(ROMUSB, romusb, na) \ + func(USB_DFU, usbdfu, na) \ +- func(MMC, mmc, 0) \ +- func(MMC, mmc, 1) \ +- func(MMC, mmc, 2) \ ++ BOOT_TARGET_MMC(func) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ +- func(PXE, pxe, na) \ +- func(DHCP, dhcp, na) ++ BOOT_TARGET_PXE(func) \ ++ BOOT_TARGET_DHCP(func) + #endif + + #define BOOTM_SIZE __stringify(0x1700000) +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0012-TESTING-test-uart_ao_a_pins-bias-disable-on-Odroid-C.patch b/projects/Amlogic/patches/u-boot/u-boot-0012-TESTING-test-uart_ao_a_pins-bias-disable-on-Odroid-C.patch new file mode 100644 index 0000000000..22422870e0 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0012-TESTING-test-uart_ao_a_pins-bias-disable-on-Odroid-C.patch @@ -0,0 +1,52 @@ +From ea0cd07c6f4628f2ad5d283a3a634f0691e99ff7 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 8 Oct 2024 06:48:13 +0000 +Subject: [PATCH 12/12] TESTING: test uart_ao_a_pins bias disable on Odroid C2 + and WeTek Hub + +This appears to resolve the reports of non-booting C2 boards. No feedback +on WeTek Hub yet. + +Suggested-by: Martin Blumenstingl +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 7 +++++++ + arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi | 7 +++++++ + 2 files changed, 14 insertions(+) + +diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi +index 5a2be8171e1..b73ce8378c9 100644 +--- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi ++++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi +@@ -35,6 +35,13 @@ + snps,reset-active-low; + }; + ++&uart_ao_a_pins { ++ mux { ++ /delete-property/ bias-disable; ++ bias-pull-up; ++ }; ++}; ++ + &usb0 { + status = "disabled"; + }; +diff --git a/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi +index 3743053eb9c..857007a134b 100644 +--- a/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi ++++ b/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi +@@ -11,3 +11,10 @@ + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-active-low; + }; ++ ++&uart_ao_a_pins { ++ mux { ++ /delete-property/ bias-disable; ++ bias-pull-up; ++ }; ++}; +-- +2.34.1 + diff --git a/scripts/uboot_helper b/scripts/uboot_helper index adb2a9147c..01d4906cca 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -164,6 +164,10 @@ devices = \ 'dtb': '', 'config': 'p212_defconfig' }, + 'alta': { + 'dtb': 'meson-g12b-a311d-libretech-cc.dtb', + 'config': 'aml-a311d-cc_defconfig' + }, 'bananapi-m2s': { 'dtb': 'meson-g12b-a311d-bananapi-m2s.dtb', 'config': 'bananapi-m2s_defconfig' @@ -228,6 +232,10 @@ devices = \ 'dtb': 'meson-g12b-radxa-zero2.dtb', 'config': 'radxa-zero2_defconfig' }, + 'solitude': { + 'dtb': 'meson-sm1-s905d3-libretech-cc.dtb', + 'config': 'aml-s905d3-cc_defconfig' + }, 'wetek-core2': { 'dtb': 'meson-gxm-wetek-core2.dtb', 'config': 'wetek-core2_defconfig'