From b52ff6a7c9b03405d65d586f4652186b2c0f8d3c Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 26 Apr 2024 21:21:14 +0200
Subject: [PATCH 01/18] RPi: update to firmware 22d5392

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/tools/bcm2835-bootloader/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index e61a12c760..1f6d712157 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="5476720d52cf579dc1627715262b30ba1242525e"
-PKG_SHA256="91430d6b50cd85e4cab0bd9ca12967a5f08b18b43ff4d9fed65676a932d7d302"
+PKG_VERSION="22d53925f8903b7d345d2ae006bf49dba4cba45b"
+PKG_SHA256="91542e80b041ee2056730d94d68991fb2d0d5b17ef58a0867e8e6d085e07240f"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

From f5c2a0d1e45b580d2988e89dcb80c962ac1a5a91 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Mon, 29 Apr 2024 19:46:38 +0200
Subject: [PATCH 02/18] linux (RPi): update to 6.6.29-7c517e7

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 0b898b0f83..d9d4e59675 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -23,8 +23,8 @@ case "${LINUX}" in
     PKG_PATCH_DIRS="default"
     ;;
   raspberrypi)
-    PKG_VERSION="8d40b03821362d445a03dc23475fc4dff3ba88a7" # 6.6.28
-    PKG_SHA256="47c36bb4e3e470f02b6be72afd0743d85bb1d7e0207d5e44bcf4522655fa5196"
+    PKG_VERSION="7c517e79b6ef29b331221829a125d816b87e8d02" # 6.6.29
+    PKG_SHA256="6dd016249d96d7a0282b13518fbf335f096adf1a64e24ea1c61cd753be0b96f2"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

From eb5674267d8717c51ffbef7142cbef1309824465 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Thu, 2 May 2024 12:35:18 +0200
Subject: [PATCH 03/18] linux (RPi): update to 6.6.29-3a8b720

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index d9d4e59675..4a7d31a90a 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -23,8 +23,8 @@ case "${LINUX}" in
     PKG_PATCH_DIRS="default"
     ;;
   raspberrypi)
-    PKG_VERSION="7c517e79b6ef29b331221829a125d816b87e8d02" # 6.6.29
-    PKG_SHA256="6dd016249d96d7a0282b13518fbf335f096adf1a64e24ea1c61cd753be0b96f2"
+    PKG_VERSION="3a8b7204348682152b77618eed061e8718db5935" # 6.6.29
+    PKG_SHA256="c069c255f4224ee046ca6b239f970f59ff93d8681582fc29b8a3fa9500f1353e"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

From 6ae81b91067c1c12450ba7b3f72583c4c185a43e Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 3 May 2024 10:45:59 +0200
Subject: [PATCH 04/18] linux (RPi): update to 6.6.30-dda85fd

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 4a7d31a90a..96ce328e20 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -23,8 +23,8 @@ case "${LINUX}" in
     PKG_PATCH_DIRS="default"
     ;;
   raspberrypi)
-    PKG_VERSION="3a8b7204348682152b77618eed061e8718db5935" # 6.6.29
-    PKG_SHA256="c069c255f4224ee046ca6b239f970f59ff93d8681582fc29b8a3fa9500f1353e"
+    PKG_VERSION="dda85fda5b2dda7c4e2ba18770bd2033313006d2" # 6.6.30
+    PKG_SHA256="55de2075e2b4d21b3d4f3159bc686dcbd938f6d61e56b21c51b58ef6919f1ac2"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

From b136d671adf14d130cbba06b5c9f0f2a604f460c Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 3 May 2024 10:45:59 +0200
Subject: [PATCH 05/18] linux (RPi): config options for 6.6.30-dda85fd

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 projects/RPi/devices/RPi/linux/linux.arm.conf      | 3 ++-
 projects/RPi/devices/RPi2/linux/linux.arm.conf     | 3 ++-
 projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 3 ++-
 projects/RPi/devices/RPi5/linux/linux.aarch64.conf | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index e84ab3f541..6ccd091fc6 100644
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.6.25 Kernel Configuration
+# Linux/arm 6.6.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
 CONFIG_CC_IS_GCC=y
@@ -478,6 +478,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options
 
 CONFIG_AS_VFP_VMRS_FPINST=y
+CONFIG_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index b7b13c008d..febef1abb3 100644
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.6.25 Kernel Configuration
+# Linux/arm 6.6.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
 CONFIG_CC_IS_GCC=y
@@ -592,6 +592,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # end of Power management options
 
 CONFIG_AS_VFP_VMRS_FPINST=y
+CONFIG_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options
diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
index 73f00e8dad..19a033292b 100644
--- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.25 Kernel Configuration
+# Linux/arm64 6.6.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
 CONFIG_CC_IS_GCC=y
@@ -580,6 +580,7 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
 # CONFIG_ACPI is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
+CONFIG_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options
diff --git a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
index 283fbec7d1..7e8410ba6c 100644
--- a/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
+++ b/projects/RPi/devices/RPi5/linux/linux.aarch64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.25 Kernel Configuration
+# Linux/arm64 6.6.30 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]"
 CONFIG_CC_IS_GCC=y
@@ -583,6 +583,7 @@ CONFIG_ARCH_SUPPORTS_ACPI=y
 # CONFIG_ACPI is not set
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
+CONFIG_CPU_MITIGATIONS=y
 
 #
 # General architecture-dependent options

From 9eefd8e595c4303f36d976ffc7f98264040b75d7 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 3 May 2024 12:06:36 +0000
Subject: [PATCH 06/18] system-tools: move smbus.so to lib and addon (1)

---
 packages/addons/tools/system-tools/changelog.txt | 3 ++-
 packages/addons/tools/system-tools/package.mk    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt
index 927b2407d4..90cd00d43f 100644
--- a/packages/addons/tools/system-tools/changelog.txt
+++ b/packages/addons/tools/system-tools/changelog.txt
@@ -1 +1,2 @@
-initial release
+1
+- move smbus.so to lib
diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
index a20284b3d0..6b6f5a6b07 100644
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -61,7 +61,7 @@ if [ "${TARGET_ARCH}" = "x86_64" ]; then
 fi
 
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,data,lib.private}
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,data,lib,lib.private}
 
     # 7-zip
     cp -P $(get_install_dir 7-zip)/usr/bin/7zz ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
@@ -121,8 +121,8 @@ addon() {
     # i2c-tools
     cp -P $(get_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
     cp -P $(get_install_dir i2c-tools)/usr/lib/${PKG_PYTHON_VERSION}/site-packages/smbus.so \
-      ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
-    patchelf --add-rpath '$ORIGIN' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/smbus.so
+      ${ADDON_BUILD}/${PKG_ADDON_ID}/lib
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/smbus.so
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so.0
     cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so.0.1.1

From a9815404730b807c1a95a8200ad3c5c0d1a2ea3e Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 3 May 2024 20:55:11 +0200
Subject: [PATCH 07/18] RPi: update to firmware 33aead4

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/tools/bcm2835-bootloader/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index 1f6d712157..fe3855e684 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="22d53925f8903b7d345d2ae006bf49dba4cba45b"
-PKG_SHA256="91542e80b041ee2056730d94d68991fb2d0d5b17ef58a0867e8e6d085e07240f"
+PKG_VERSION="33aead4c6edca751b33b794c7100fae6cf1d4784"
+PKG_SHA256="10a851e39ca08713873ab28911f72cb9b6f64a14385c2bb0f828d9f7f02d9c75"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

From a1ef54185ca5d05a5e83e118ef7d51c5341fcce7 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 5 May 2024 00:28:34 +0000
Subject: [PATCH 08/18] fdupes: add missing sqlite DEPEND

---
 .../addons/addon-depends/system-tools-depends/fdupes/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk
index afa0461339..22145a2488 100644
--- a/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/fdupes/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="6170d64a7e565ee314cca4dd25a123e60aa1e3febb11e57078bebb9c1da7e019"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/adrianlopezroche/fdupes"
 PKG_URL="https://github.com/adrianlopezroche/fdupes/releases/download/v${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain ncurses"
+PKG_DEPENDS_TARGET="toolchain ncurses sqlite"
 PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."
 PKG_BUILD_FLAGS="-sysroot"
 

From 3b60287f756cdc4135ebbc171633b03c79dda348 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 4 May 2024 14:59:27 +0000
Subject: [PATCH 09/18] pvr.plutotv: update 21.1.1-Omega to 21.2.0-Omega

---
 .../mediacenter/kodi-binary-addons/pvr.plutotv/package.mk   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
index b03a85d4b9..4d4b6cd5e8 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.plutotv"
-PKG_VERSION="21.1.1-Omega"
-PKG_SHA256="bbdaf6c607ca2aa004474dab039bcd7804faa98b2dad7fc84cb9d7b6ecf68cc2"
-PKG_REV="2"
+PKG_VERSION="21.2.0-Omega"
+PKG_SHA256="800e0aa7643744f398bb729d44795b34eb742a56a52e8ac862f0b62167462593"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kodi-pvr/pvr.plutotv"

From 7fdcd423be716a3443c849475acf225ca658eef0 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sun, 5 May 2024 00:43:58 +0000
Subject: [PATCH 10/18] visualization.projectm: update 20.2.0-Nexus to
 21.0.1-Omega

---
 .../kodi-binary-addons/visualization.projectm/package.mk    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk
index 639bd918fe..b16319ee36 100644
--- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk
@@ -3,9 +3,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="visualization.projectm"
-PKG_VERSION="20.2.0-Nexus"
-PKG_SHA256="42599b0093ebc6730c3190ce28036a87042814af830441f3cb28ef11676277ae"
-PKG_REV="2"
+PKG_VERSION="21.0.1-Omega"
+PKG_SHA256="71e99eb4ba79df21afa17a058b77905f56daa2417a94b1b7cf557efa2b48a64a"
+PKG_REV="1"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/visualization.projectm"
 PKG_URL="https://github.com/xbmc/visualization.projectm/archive/${PKG_VERSION}.tar.gz"

From 0ce585e99cb60e20a5122e8762c8fd44ec2d5c2a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 7 May 2024 02:42:57 +0000
Subject: [PATCH 11/18] pvr.plutotv: update 21.2.0-Omega to 21.3.0-Omega

---
 .../mediacenter/kodi-binary-addons/pvr.plutotv/package.mk     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
index 4d4b6cd5e8..47932c1459 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.plutotv/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.plutotv"
-PKG_VERSION="21.2.0-Omega"
-PKG_SHA256="800e0aa7643744f398bb729d44795b34eb742a56a52e8ac862f0b62167462593"
+PKG_VERSION="21.3.0-Omega"
+PKG_SHA256="fb026664222af3415bb805c4b2c19d1893f9e05a7d089c2d720a495131d1460d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

From 60530331690fb7173a71eb1704542876d5fe1ce8 Mon Sep 17 00:00:00 2001
From: Michele Zuccala <ardutu@gmail.com>
Date: Tue, 7 May 2024 22:22:32 +0200
Subject: [PATCH 12/18] u-boot (RK3328): BACKPORT: Set efuse auto mode and
 timing control

Backport commit[1] that enables efuse and fixes a bug related to video resolutions <=720p

1. https://github.com/u-boot/u-boot/commit/5708e8eeae53ad8ce605afdf61e5a83162dc5131
---
 ...t-efuse-auto-mode-and-timing-control.patch | 102 ++++++++++++++++++
 ...-rk3328-Set-VOP-QoS-to-high-priority.patch |  12 +--
 2 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 projects/Rockchip/patches/u-boot/0001-rockchip-rk3328-BACKPORT-Set-efuse-auto-mode-and-timing-control.patch

diff --git a/projects/Rockchip/patches/u-boot/0001-rockchip-rk3328-BACKPORT-Set-efuse-auto-mode-and-timing-control.patch b/projects/Rockchip/patches/u-boot/0001-rockchip-rk3328-BACKPORT-Set-efuse-auto-mode-and-timing-control.patch
new file mode 100644
index 0000000000..543b940a1b
--- /dev/null
+++ b/projects/Rockchip/patches/u-boot/0001-rockchip-rk3328-BACKPORT-Set-efuse-auto-mode-and-timing-control.patch
@@ -0,0 +1,102 @@
+From 5708e8eeae53ad8ce605afdf61e5a83162dc5131 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 7 Jan 2024 18:18:33 +0000
+Subject: [PATCH] rockchip: rk3328: Set efuse auto mode and timing control
+
+Reading from efuse return zero when mainline TF-A is used.
+
+  => dump_efuse
+  00000000: 00 00 00 00  ....
+  00000004: 00 00 00 00  ....
+  00000008: 00 00 00 00  ....
+  0000000c: 00 00 00 00  ....
+  00000010: 00 00 00 00  ....
+  00000014: 00 00 00 00  ....
+  00000018: 00 00 00 00  ....
+  0000001c: 00 00 00 00  ....
+
+However, when vendor TF-A blobs is used reading from efuse works.
+
+Change to use auto mode, enable finish and auto access err interrupts
+and set timing control using same values that vendor TF-A blob use to
+fix this.
+
+With this efuse can be read when either of mainline TF-A or vendor blob
+is used.
+
+  => dump_efuse
+  00000000: 52 4b 33 82  RK3.
+  00000004: 00 fe 21 55  ..!U
+  00000008: 52 4b 57 34  RKW4
+  0000000c: 35 30 32 39  5029
+  00000010: 00 00 00 00  ....
+  00000014: 08 25 0c 0f  .%..
+  00000018: 02 0d 08 00  ....
+  0000001c: 00 00 f0 00  ....
+
+Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
+Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
+---
+ arch/arm/mach-rockchip/rk3328/rk3328.c | 38 ++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
+index de17b886827..ca623c0d3d0 100644
+--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
++++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
+@@ -19,6 +19,23 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define GRF_BASE		0xFF100000
+ #define UART2_BASE		0xFF130000
+ #define FW_DDR_CON_REG		0xFF7C0040
++#define EFUSE_NS_BASE		0xFF260000
++
++#define EFUSE_MOD		0x0000
++#define EFUSE_INT_CON		0x0014
++#define EFUSE_T_CSB_P		0x0028
++#define EFUSE_T_PGENB_P		0x002C
++#define EFUSE_T_LOAD_P		0x0030
++#define EFUSE_T_ADDR_P		0x0034
++#define EFUSE_T_STROBE_P	0x0038
++#define EFUSE_T_CSB_R		0x003C
++#define EFUSE_T_PGENB_R		0x0040
++#define EFUSE_T_LOAD_R		0x0044
++#define EFUSE_T_ADDR_R		0x0048
++#define EFUSE_T_STROBE_R	0x004C
++
++#define EFUSE_USER_MODE		0x1
++#define EFUSE_TIMING(s, l)	(((s) << 16) | (l))
+ 
+ const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
+ 	[BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
+@@ -50,10 +67,31 @@ struct mm_region *mem_map = rk3328_mem_map;
+ int arch_cpu_init(void)
+ {
+ #ifdef CONFIG_SPL_BUILD
++	u32 reg;
++
+ 	/* We do some SoC one time setting here. */
+ 
+ 	/* Disable the ddr secure region setting to make it non-secure */
+ 	rk_setreg(FW_DDR_CON_REG, 0x200);
++
++	/* Use efuse auto mode */
++	reg = readl(EFUSE_NS_BASE + EFUSE_MOD);
++	writel(reg & ~EFUSE_USER_MODE, EFUSE_NS_BASE + EFUSE_MOD);
++
++	/* Enable efuse finish and auto access err interrupt */
++	writel(0x07, EFUSE_NS_BASE + EFUSE_INT_CON);
++
++	/* Set efuse timing control */
++	writel(EFUSE_TIMING(1, 241), EFUSE_NS_BASE + EFUSE_T_CSB_P);
++	writel(EFUSE_TIMING(1, 241), EFUSE_NS_BASE + EFUSE_T_PGENB_P);
++	writel(EFUSE_TIMING(1, 241), EFUSE_NS_BASE + EFUSE_T_LOAD_P);
++	writel(EFUSE_TIMING(1, 241), EFUSE_NS_BASE + EFUSE_T_ADDR_P);
++	writel(EFUSE_TIMING(2, 240), EFUSE_NS_BASE + EFUSE_T_STROBE_P);
++	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_CSB_R);
++	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_PGENB_R);
++	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_LOAD_R);
++	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_ADDR_R);
++	writel(EFUSE_TIMING(2, 3), EFUSE_NS_BASE + EFUSE_T_STROBE_R);
+ #endif
+ 	return 0;
+ }
diff --git a/projects/Rockchip/patches/u-boot/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch b/projects/Rockchip/patches/u-boot/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch
index 7aa2d3f8bd..59b1561c33 100644
--- a/projects/Rockchip/patches/u-boot/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch
+++ b/projects/Rockchip/patches/u-boot/0004-rockchip-rk3328-Set-VOP-QoS-to-high-priority.patch
@@ -18,19 +18,19 @@ diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3
 index de17b88682..58300bdf3f 100644
 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c
 +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
-@@ -19,6 +19,8 @@ DECLARE_GLOBAL_DATA_PTR;
+@@ -16,6 +16,8 @@ DECLARE_GLOBAL_DATA_PTR;
  #define GRF_BASE		0xFF100000
  #define UART2_BASE		0xFF130000
  #define FW_DDR_CON_REG		0xFF7C0040
 +#define QOS_VOP_OFFSET		0xFF760080
 +#define QOS_VOP_PRIORITY	0x8
+ #define EFUSE_NS_BASE		0xFF260000
  
- const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- 	[BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000",
+ #define EFUSE_MOD		0x0000
 @@ -54,6 +56,9 @@ int arch_cpu_init(void)
- 
- 	/* Disable the ddr secure region setting to make it non-secure */
- 	rk_setreg(FW_DDR_CON_REG, 0x200);
+ 	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_LOAD_R);
+ 	writel(EFUSE_TIMING(1, 4), EFUSE_NS_BASE + EFUSE_T_ADDR_R);
+ 	writel(EFUSE_TIMING(2, 3), EFUSE_NS_BASE + EFUSE_T_STROBE_R);
 +#else
 +	printf("Setting VOP QoS\n");
 +	rk_setreg(QOS_VOP_OFFSET + QOS_VOP_PRIORITY, 0xF);

From 54da347cd1c53404880e04e67cc030396dc36dfd Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 8 May 2024 11:56:30 +0000
Subject: [PATCH 13/18] kodi-binary-addons: update to latest versions

- pvr.mediaportal.tvserver: update 21.0.1-Omega to 21.0.2-Omega
- pvr.waipu: update 21.5.1-Omega to 21.6.0-Omega
---
 .../kodi-binary-addons/pvr.mediaportal.tvserver/package.mk  | 6 +++---
 .../mediacenter/kodi-binary-addons/pvr.waipu/package.mk     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
index cd45ee86f3..ad47703f87 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
@@ -3,9 +3,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="21.0.1-Omega"
-PKG_SHA256="fa0c0bffe41140a224701d4fa1a73c09a45ef0a9f309cc5ad33cdf13795f7812"
-PKG_REV="2"
+PKG_VERSION="21.0.2-Omega"
+PKG_SHA256="9e8c92b49433f46ae681055762ca4c152481b258c9163a1119c1ca08d7e9fd7c"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
diff --git a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
index 3533a674a2..20c9becc09 100644
--- a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pvr.waipu"
-PKG_VERSION="21.5.1-Omega"
-PKG_SHA256="bad2902e3f890d3e8984e59ec77d4ec666808d36f45decb661fe8e2b8efb410b"
-PKG_REV="2"
+PKG_VERSION="21.6.0-Omega"
+PKG_SHA256="0db467d4986c36efb0c837dd728fc6322d3021fe2d8c93da9355b63f210fa0ca"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/flubshi/pvr.waipu"

From bd77b43f15f598e13a9406dfbf546dc832d380f6 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Wed, 8 May 2024 19:29:03 +0200
Subject: [PATCH 14/18] Allwinner: linux: Fix OrangePi 3 LTS ethernet

---
 .../patches/linux/0041-OrangePi-3-LTS-support.patch    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch b/projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch
index 03ce2e5a0f..abc19bedb0 100644
--- a/projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch
+++ b/projects/Allwinner/patches/linux/0041-OrangePi-3-LTS-support.patch
@@ -27,7 +27,7 @@ new file mode 100644
 index 000000000000..6a5df1103a90
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts
-@@ -0,0 +1,318 @@
+@@ -0,0 +1,316 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +// Copyright (C) 2023 Jernej Skrabec <jernej.skrabec@gmail.com>
 +// Based on sun50i-h6-orangepi-3.dts, which is:
@@ -131,10 +131,10 @@ index 000000000000..6a5df1103a90
 +&emac {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&ext_rgmii_pins>;
-+	phy-mode = "rgmii";
++	phy-mode = "rgmii-rxid";
 +	phy-handle = <&ext_rgmii_phy>;
 +	phy-supply = <&reg_gmac_3v3>;
-+	allwinner,rx-delay-ps = <1500>;
++	allwinner,rx-delay-ps = <0>;
 +	allwinner,tx-delay-ps = <700>;
 +	status = "okay";
 +};
@@ -161,12 +161,10 @@ index 000000000000..6a5df1103a90
 +		reg = <1>;
 +
 +		motorcomm,clk-out-frequency-hz = <125000000>;
-+		motorcomm,keep-pll-enabled;
-+		motorcomm,auto-sleep-disabled;
 +
 +		reset-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
 +		reset-assert-us = <15000>;
-+		reset-deassert-us = <40000>;
++		reset-deassert-us = <100000>;
 +	};
 +};
 +

From 23661ec813f8fd3902c48db75f4848467ee78196 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 8 May 2024 22:26:52 +0000
Subject: [PATCH 15/18] mesa: update to 24.0.7

---
 packages/graphics/mesa/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index 8caee36799..d57b027f31 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="24.0.6"
-PKG_SHA256="8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604"
+PKG_VERSION="24.0.7"
+PKG_SHA256="7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz"

From b395a0b2ec6ae73364e8a7ed09285a7dcbe59f10 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Thu, 2 May 2024 13:03:10 -0700
Subject: [PATCH 16/18] game.libretro.a5200: Update for authentic Atari
 buttonmap

---
 .../kodi-binary-addons/game.libretro.a5200/package.mk       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.a5200/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.a5200/package.mk
index d120281312..9b06c98327 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.a5200/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.a5200/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="game.libretro.a5200"
-PKG_VERSION="2.0.2.15-Nexus"
-PKG_SHA256="eb49aa0dc4f3e7d8798af3de503274f92f63469695ffc619aaca8131966203d1"
-PKG_REV="2"
+PKG_VERSION="2.0.2.17-Nexus"
+PKG_SHA256="6bf181be1c93dd510be1491712ffb695c9db87ee19c3ef7bbd4a78a4bcaed1cf"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/kodi-game/game.libretro.a5200"

From be15b7548b981a791438d2d7e7887dd3159e91f0 Mon Sep 17 00:00:00 2001
From: Garrett Brown <themagnificentmrb@gmail.com>
Date: Thu, 2 May 2024 13:03:37 -0700
Subject: [PATCH 17/18] game.libretro.atari800: Update for authentic Atari
 buttonmap

---
 .../kodi-binary-addons/game.libretro.atari800/package.mk    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk
index ed2041996d..282118ee23 100644
--- a/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="game.libretro.atari800"
-PKG_VERSION="3.1.0.33-Nexus"
-PKG_SHA256="7211f8f1c62e685788c9161b4b8849384df06acea9b6c94f7c77273f59a8423d"
-PKG_REV="2"
+PKG_VERSION="3.1.0.34-Nexus"
+PKG_SHA256="5501e28d28a91857b07276285f7e25d4a03ea6ff0a2afee89145fe85cd3c3882"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/kodi-game/game.libretro.atari800"

From b31d84a16b5301d2639583d4fda0c126d67fd2ef Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 10 May 2024 12:25:48 +0000
Subject: [PATCH 18/18] inputstream.adaptive: update 21.4.6-Omega to
 21.4.7-Omega

---
 .../kodi-binary-addons/inputstream.adaptive/package.mk        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
index 1b316fe476..1a35303a5b 100644
--- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="21.4.6-Omega"
-PKG_SHA256="0729f28feed662a36ad5bbce92ff457030cde01f28352bab6e8571a7be0cb88d"
+PKG_VERSION="21.4.7-Omega"
+PKG_SHA256="0b3a78763ffebef64ac05bcf55951f26e334f7ee8bbe042f885dff288eed466e"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"