From d2bbfa6c1ba377aa7c0aaaff9077b0fe1eeed87e Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 4 Jul 2024 07:44:16 +0000
Subject: [PATCH 1/2] u-boot: update to 2024.07

---
 packages/tools/u-boot/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index ca3c1d62e3..d4e7669c14 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="u-boot"
-PKG_VERSION="2024.04"
-PKG_SHA256="18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a"
+PKG_VERSION="2024.07"
+PKG_SHA256="f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"

From 83fe5d271602240efe9db9c14cade8c785f78ed4 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 4 Jul 2024 13:59:25 +0000
Subject: [PATCH 2/2] u-boot (Rockchip): drop upstreamed patches for 2024.07

replaced by upstream:
- https://github.com/u-boot/u-boot/commit/1520e81871d677612b19202806fab2de56dfe3e1
- https://github.com/u-boot/u-boot/commit/2dfa45a785d2a92073589d3a42214b9b90dd04f4
- https://github.com/u-boot/u-boot/commit/4e3c7e89d9028cd05978e1bd34fe052922aea4c5
- https://github.com/u-boot/u-boot/commit/055061dc35c55a7b1af4cd48b05d6f026fa5cc69
---
 ...9-evb-Don-t-initalize-i2c-bus-in-SPL.patch | 37 -------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 projects/Rockchip/patches/u-boot/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch

diff --git a/projects/Rockchip/patches/u-boot/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch b/projects/Rockchip/patches/u-boot/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch
deleted file mode 100644
index d1984ee807..0000000000
--- a/projects/Rockchip/patches/u-boot/0006-Rockchip-rk3399-evb-Don-t-initalize-i2c-bus-in-SPL.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alex Bee <knaerzche@gmail.com>
-Date: Mon, 31 Oct 2022 17:16:07 +0100
-Subject: [PATCH 6/6] Rockchip: rk3399-evb: Don't initalize i2c bus in SPL
-
-Since we are using this device as fallback for boards which are not supported
-by mainline u-boot in combination with vendor TPL/SPL, we need to make sure
-that i2c is initalized in BL33 because vendor bootchain doesn't do that in
-an earlier level.
----
- arch/arm/dts/rk3399-evb-u-boot.dtsi | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
-index 5e39b1493d..18733da7f9 100644
---- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
-@@ -9,18 +9,10 @@
- / {
- 	chosen {
- 		stdout-path = "serial2:1500000n8";
--		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
-+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
- 	};
- };
- 
--&i2c0 {
--	bootph-all;
--};
--
--&rk808 {
--	bootph-all;
--};
--
- &tcphy1 {
- 	status = "okay";
- };