From: Zoltan HERPAI Date: Mon, 2 Feb 2026 09:16:32 +0000 (+0000) Subject: uboot-sunxi: bump to 2025.10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40d416c549e5379d76c3b4240dccd1c13952a0d;p=thirdparty%2Fopenwrt.git uboot-sunxi: bump to 2025.10 Compile-tested: all targets Runtime-tested: - Linksprite pcDuino v2 (A10) - Banana Pro (A20) - Banana Pi M2 Berry (V40) - Banana Pi P2 Zero (H2+) - Pine64+ (A64) Patches refreshed as required. Signed-off-by: Zoltan HERPAI --- diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 7cd061b03f3..072ec12b4c8 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk -PKG_VERSION:=2025.01 -PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f +PKG_VERSION:=2025.10 +PKG_HASH:=b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a PKG_MAINTAINER:=Zoltan HERPAI diff --git a/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch b/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch index c19f3781d18..f59e60c8adf 100644 --- a/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch +++ b/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch @@ -2,7 +2,7 @@ +++ b/configs/OLIMEX_A13_SOM_defconfig @@ -0,0 +1,17 @@ +CONFIG_SPL=y -+CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino" ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun5i-a13-olinuxino" +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y diff --git a/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch b/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch index a1caf18a184..3c79ff3de48 100644 --- a/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch +++ b/package/boot/uboot-sunxi/patches/062-A20-improve-gmac-upload.patch @@ -2,7 +2,7 @@ --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig -@@ -25,6 +25,7 @@ CONFIG_ETH_DESIGNWARE=y +@@ -24,6 +24,7 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_RGMII=y CONFIG_MII=y CONFIG_SUN7I_GMAC=y diff --git a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch index 0307d6b99b2..2774355ac14 100644 --- a/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sunxi/patches/200-mkimage-check-environment-for-dtc-binary-location.patch @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -774,9 +774,14 @@ static int fit_handle_file(struct image_ +@@ -881,9 +881,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { diff --git a/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch b/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch deleted file mode 100644 index ecc2eb2d25a..00000000000 --- a/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 08d194d881e10e09cba7551da8079734d89ed16d Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Thu, 16 Jun 2022 00:28:41 +0800 -Subject: [PATCH 1/2] add USB support and PopStick support - -Signed-off-by: Icenowy Zheng ---- - arch/arm/dts/Makefile | 3 +- - arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 16 ++++ - arch/arm/dts/suniv-f1c100s.dtsi | 26 ++++++ - arch/arm/dts/suniv-f1c200s-popstick.dts | 89 ++++++++++++++++++++ - drivers/phy/allwinner/phy-sun4i-usb.c | 14 +++ - drivers/usb/musb-new/sunxi.c | 6 ++ - 6 files changed, 153 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/dts/suniv-f1c200s-popstick.dts - ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -647,7 +647,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disc - stm32h750i-art-pi.dtb - - dtb-$(CONFIG_MACH_SUNIV) += \ -- suniv-f1c100s-licheepi-nano.dtb -+ suniv-f1c100s-licheepi-nano.dtb \ -+ suniv-f1c200s-popstick.dtb - dtb-$(CONFIG_MACH_SUN4I) += \ - sun4i-a10-a1000.dtb \ - sun4i-a10-ba10-tvbox.dtb \ ---- /dev/null -+++ b/arch/arm/dts/suniv-f1c200s-popstick.dts -@@ -0,0 +1,89 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright 2022 Icenowy Zheng -+ */ -+ -+/dts-v1/; -+#include "suniv-f1c100s.dtsi" -+ -+#include -+ -+/ { -+ model = "Popcorn Computer PopStick"; -+ compatible = "sourceparts,popstick", "allwinner,suniv-f1c200s", -+ "allwinner,suniv-f1c100s"; -+ -+ aliases { -+ mmc0 = &mmc0; -+ serial0 = &uart0; -+ spi0 = &spi0; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+}; -+ -+&mmc0 { -+ broken-cd; -+ bus-width = <4>; -+ disable-wp; -+ status = "okay"; -+ vmmc-supply = <®_vcc3v3>; -+}; -+ -+&spi0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&spi0_pc_pins>; -+ status = "okay"; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "spi-nand"; -+ reg = <0>; -+ spi-max-frequency = <1000000>; -+ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "u-boot-with-spl"; -+ reg = <0x0 0x100000>; -+ }; -+ -+ ubi@100000 { -+ label = "ubi"; -+ reg = <0x100000 0x7f00000>; -+ }; -+ }; -+ }; -+}; -+ -+&otg_sram { -+ status = "okay"; -+}; -+ -+&uart0 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&uart0_pe_pins>; -+ status = "okay"; -+}; -+ -+&usb_otg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&usbphy { -+ status = "okay"; -+}; diff --git a/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch b/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch index 56f8192160e..5b9e3db8a85 100644 --- a/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch +++ b/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch @@ -17,7 +17,7 @@ Subject: [PATCH 2/2] HACK for UBI env and add defconfig +CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y +CONFIG_ARCH_SUNXI=y +CONFIG_ENV_SIZE=0x1f000 -+CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-popstick" ++CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-popstick-v1.1" +CONFIG_SPL=y +CONFIG_MACH_SUNIV=y +CONFIG_DRAM_CLK=156