Merge pull request #6630 from heitbaum/u-boot

u-boot and u-boot-tools: update to 2022.07

packages/tools/u-boot-tools/package.mk

@@ -2,11 +2,11 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="u-boot-tools"
-PKG_VERSION="2022.04"
-PKG_SHA256="68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0"
+PKG_VERSION="2022.07"
+PKG_SHA256="92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://ftp.denx.de/pub/u-boot/u-boot-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="ccache:host bison:host flex:host openssl:host pkg-config:host"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 

packages/tools/u-boot/package.mk

@@ -29,9 +29,9 @@ case "${PROJECT}" in
     PKG_PATCH_DIRS="rockchip"
     ;;
   *)
-    PKG_VERSION="2022.04"
-    PKG_SHA256="68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0"
-    PKG_URL="http://ftp.denx.de/pub/u-boot/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+    PKG_VERSION="2022.07"
+    PKG_SHA256="92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e"
+    PKG_URL="https://ftp.denx.de/pub/u-boot/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
     ;;
 esac
 

projects/Allwinner/devices/H3/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch

@@ -178,17 +178,19 @@ diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h
 index 563635636624..2f0d69bdfce2 100644
 --- a/include/configs/sun8i.h
 +++ b/include/configs/sun8i.h
-@@ -22,6 +22,10 @@
-  */
- #define CONFIG_ARMV7_SECURE_BASE	(SUNXI_SRAM_A2_BASE + 16 * 1024)
- #define CONFIG_ARMV7_SECURE_MAX_SIZE	(SUNXI_SRAM_A2_SIZE - 33 * 1024)
-+
+@@ -14,6 +14,12 @@
+ 
+ #include <asm/arch/cpu.h>
+ 
++#ifdef SUNXI_SRAM_A2_SIZE
 +#define SUNXI_RESUME_BASE		(CONFIG_ARMV7_SECURE_BASE + \
 +					 CONFIG_ARMV7_SECURE_MAX_SIZE)
 +#define SUNXI_RESUME_SIZE		1024
- #endif
- 
++#endif
++
  /*
+  * Include common sunxi configuration where most the settings are
+  */
 -- 
 2.33.0
 

projects/Allwinner/patches/u-boot/0014-arm64-dts-allwinner-h6-tanix-tx6-enable-emmc.patch

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jernej Skrabec <jernej.skrabec@siol.net>
-Date: Wed, 15 Jan 2020 18:39:17 +0100
-Subject: [PATCH] arm64: dts: allwinner: h6: tanix-tx6: enable emmc
-
-Tanix TX6 has 32 GiB eMMC. Add a node for it.
-
-Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
----
- .../dts/allwinner/sun50i-h6-tanix-tx6.dts     | 20 +++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
---- a/arch/arm/dts/sun50i-h6-tanix-tx6.dts
-+++ b/arch/arm/dts/sun50i-h6-tanix-tx6.dts
-@@ -32,6 +32,13 @@
- 		};
- 	};
- 
-+	reg_vcc1v8: vcc1v8 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc1v8";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <1800000>;
-+	};
-+
- 	reg_vcc3v3: vcc3v3 {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vcc3v3";
-@@ -91,6 +98,15 @@
- 	status = "okay";
- };
- 
-+&mmc2 {
-+	vmmc-supply = <&reg_vcc3v3>;
-+	vqmmc-supply = <&reg_vcc1v8>;
-+	non-removable;
-+	cap-mmc-hw-reset;
-+	bus-width = <8>;
-+	status = "okay";
-+};
-+
- &ohci0 {
- 	status = "okay";
- };
-@@ -99,6 +115,10 @@
- 	status = "okay";
- };
- 
-+&pio {
-+	vcc-pc-supply = <&reg_vcc1v8>;
-+};
-+
- &r_ir {
- 	linux,rc-map-name = "rc-tanix-tx5max";
- 	status = "okay";

projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch

@@ -37,7 +37,7 @@ index 7a5891652f..e301bc736d 100644
 -	"initrd_high=0xffffffffffffffff\0"				\
 -	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0"		\
 -	"mmcpart=1\0"	\
--	"mmcroot=" CONFIG_MMCROOT " rootwait rw\0"			\
+-	"mmcroot=/dev/mmcblk1p2 rootwait rw\0"			\
 -	"mmcautodetect=yes\0"						\
 -	"mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 "	\
 -	"loadbootscript="						\