From b00f779cb97fe28fce47131a36fc51381f40f52a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 20 Jun 2022 10:38:20 +0000 Subject: [PATCH 1/6] u-boot (Allwinner): drop upstreamed patches --- ...s-allwinner-h6-tanix-tx6-enable-emmc.patch | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 projects/Allwinner/patches/u-boot/0014-arm64-dts-allwinner-h6-tanix-tx6-enable-emmc.patch diff --git a/projects/Allwinner/patches/u-boot/0014-arm64-dts-allwinner-h6-tanix-tx6-enable-emmc.patch b/projects/Allwinner/patches/u-boot/0014-arm64-dts-allwinner-h6-tanix-tx6-enable-emmc.patch deleted file mode 100644 index 73173f2c48..0000000000 --- a/projects/Allwinner/patches/u-boot/0014-arm64-dts-allwinner-h6-tanix-tx6-enable-emmc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -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 ---- - .../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 = <®_vcc3v3>; -+ vqmmc-supply = <®_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 = <®_vcc1v8>; -+}; -+ - &r_ir { - linux,rc-map-name = "rc-tanix-tx5max"; - status = "okay"; From 5bc1404a588620c652d51580ed1d597406757351 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 20 Jun 2022 10:12:57 +0000 Subject: [PATCH 2/6] u-boot (Allwinner): rebase H3 hotplug patch ref: - https://github.com/u-boot/u-boot/commit/0da35fa8d67415c7d595f6a74952905decc2a911 --- ...i-psci-Add-support-for-H3-CPU-0-hotplug.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/projects/Allwinner/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch b/projects/Allwinner/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch index b7af712bbb..4b5b457110 100644 --- a/projects/Allwinner/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch +++ b/projects/Allwinner/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 + ++#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 From 2af55ff5409912d0a2320940b30805d46d8301a9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 22 Jun 2022 19:36:00 +0000 Subject: [PATCH 3/6] u-boot (NXP iMX8): rebase pico-imx8mq --- .../u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch b/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch index b7ee48dfa5..f1dac88678 100644 --- a/projects/NXP/devices/iMX8/patches/u-boot/0005-pico-imx8mq-add-distro-boot-cmd-support.patch +++ b/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=" \ From 3b16fe1980e107facae0be1e3d0ce4e95ce674a7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 20 Jun 2022 09:51:53 +0000 Subject: [PATCH 4/6] u-boot: update to 2022.07 and https --- packages/tools/u-boot/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 1a1de33fe6..2cbb47cc3e 100644 --- a/packages/tools/u-boot/package.mk +++ b/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 From 591993b3e21e3538498d37941744471b8419ec20 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 20 Jun 2022 09:50:43 +0000 Subject: [PATCH 5/6] u-boot-tools: update to 2022.07 and https --- packages/tools/u-boot-tools/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk index 9ecaf429d7..1a5ce0b742 100644 --- a/packages/tools/u-boot-tools/package.mk +++ b/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." From 2ce5d60fc2edced0596cb1a3ec5876a1ab8ba527 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 12 Jul 2022 06:42:01 +0000 Subject: [PATCH 6/6] u-boot (Allwinner): move H3 patches to H3 folder --- .../u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch | 0 .../u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename projects/Allwinner/{ => devices/H3}/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch (100%) rename projects/Allwinner/{ => devices/H3}/patches/u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch (100%) diff --git a/projects/Allwinner/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch b/projects/Allwinner/devices/H3/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch similarity index 100% rename from projects/Allwinner/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch rename to projects/Allwinner/devices/H3/patches/u-boot/0007-sunxi-psci-Add-support-for-H3-CPU-0-hotplug.patch diff --git a/projects/Allwinner/patches/u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch b/projects/Allwinner/devices/H3/patches/u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch similarity index 100% rename from projects/Allwinner/patches/u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch rename to projects/Allwinner/devices/H3/patches/u-boot/0010-sunxi-Enable-support-for-SCP-firmware-on-H3.patch