From 7e38101ed6d69b38a6aa36d30a68c378c4dc7beb Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Mon, 2 Feb 2026 12:35:37 -0500 Subject: [PATCH] BPI-M4-Zero / KickPi K2B: Update u-boot to v2026.01 Signed-off-by: Patrick Yavitz --- .../001-Add-board-BananaPi-BPI-M4-Zero.patch | 3 +- .../002-Add-board-KickPi-K2B.patch | 81 +++++++------------ .../010-HACK-sunxi-h616-gpu-enable.patch} | 18 ++--- .../011-sunxi-h616-ths-workaround.patch} | 10 +-- ...-add-delay-to-steady-dram-detection.patch} | 0 .../{v2025.07 => v2026.01}/board_kickpik2b | 0 6 files changed, 45 insertions(+), 67 deletions(-) rename patch/u-boot/{v2025.07 => v2026.01}/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch (99%) rename patch/u-boot/{v2025.07 => v2026.01}/board_bananapim4zero/002-Add-board-KickPi-K2B.patch (83%) rename patch/u-boot/{v2025.07/board_bananapim4zero/050-HACK-sunxi-h616-gpu-enable.patch => v2026.01/board_bananapim4zero/010-HACK-sunxi-h616-gpu-enable.patch} (55%) rename patch/u-boot/{v2025.07/board_bananapim4zero/051-sunxi-h616-ths-workaround.patch => v2026.01/board_bananapim4zero/011-sunxi-h616-ths-workaround.patch} (78%) rename patch/u-boot/{v2025.07/board_bananapim4zero/052-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch => v2026.01/board_bananapim4zero/012-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch} (100%) rename patch/u-boot/{v2025.07 => v2026.01}/board_kickpik2b (100%) diff --git a/patch/u-boot/v2025.07/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch b/patch/u-boot/v2026.01/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch similarity index 99% rename from patch/u-boot/v2025.07/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch rename to patch/u-boot/v2026.01/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch index 3ff72acb50..fcf248e506 100644 --- a/patch/u-boot/v2025.07/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch +++ b/patch/u-boot/v2026.01/board_bananapim4zero/001-Add-board-BananaPi-BPI-M4-Zero.patch @@ -346,7 +346,8 @@ Subject: [PATCH] Enable KASLR Signed-off-by: Patrick Yavitz --- configs/bananapi_m4zero_defconfig | 2 ++ - 1 files changed, 2 insertions(+) + configs/kickpi_k2b_defconfig | 2 ++ + 2 files changed, 4 insertions(+) diff --git a/configs/bananapi_m4zero_defconfig b/configs/bananapi_m4zero_defconfig index 6d70efd1a50..0c41226db49 100644 diff --git a/patch/u-boot/v2025.07/board_bananapim4zero/002-Add-board-KickPi-K2B.patch b/patch/u-boot/v2026.01/board_bananapim4zero/002-Add-board-KickPi-K2B.patch similarity index 83% rename from patch/u-boot/v2025.07/board_bananapim4zero/002-Add-board-KickPi-K2B.patch rename to patch/u-boot/v2026.01/board_bananapim4zero/002-Add-board-KickPi-K2B.patch index 3add0cef34..0e7e22f79a 100644 --- a/patch/u-boot/v2025.07/board_bananapim4zero/002-Add-board-KickPi-K2B.patch +++ b/patch/u-boot/v2026.01/board_bananapim4zero/002-Add-board-KickPi-K2B.patch @@ -1,23 +1,22 @@ -From 7e3cbdf04b745a635838e95c7ce99e39de6c422b Mon Sep 17 00:00:00 2001 +From 652529282f1684b3fc4dccae903b931f818c2e23 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz -Date: Wed, 30 Jul 2025 07:32:57 -0400 +Date: Wed, 29 Oct 2025 08:39:51 -0400 Subject: [PATCH] Add board KickPi K2B Signed-off-by: Patrick Yavitz --- - configs/kickpi_k2b_defconfig | 34 ++ - .../allwinner/sun50i-h618-kickpi-k2b.dts | 315 ++++++++++++++++++ - 2 files changed, 349 insertions(+) + configs/kickpi_k2b_defconfig | 32 ++ + .../allwinner/sun50i-h618-kickpi-k2b.dts | 327 ++++++++++++++++++ + 2 files changed, 359 insertions(+) create mode 100644 configs/kickpi_k2b_defconfig create mode 100644 dts/upstream/src/arm64/allwinner/sun50i-h618-kickpi-k2b.dts diff --git a/configs/kickpi_k2b_defconfig b/configs/kickpi_k2b_defconfig new file mode 100644 -index 00000000000..912b4633dd1 +index 00000000000..80ec70c3988 --- /dev/null +++ b/configs/kickpi_k2b_defconfig -@@ -0,0 +1,34 @@ -+CONFIG_OF_UPSTREAM=y +@@ -0,0 +1,32 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun50i-h618-kickpi-k2b" @@ -36,6 +35,7 @@ index 00000000000..912b4633dd1 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_R_I2C_ENABLE=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_CMD_KASLRSEED=y +CONFIG_SPL_I2C=y +CONFIG_SPL_SYS_I2C_LEGACY=y +CONFIG_SYS_I2C_MVTWSI=y @@ -43,20 +43,18 @@ index 00000000000..912b4633dd1 +CONFIG_SYS_I2C_SPEED=400000 +CONFIG_SUN8I_EMAC=y +CONFIG_SUPPORT_EMMC_BOOT=y -+CONFIG_PHY_REALTEK=y -+CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y -+CONFIG_RGMII=y -+CONFIG_RMII=y +CONFIG_AXP313_POWER=y ++CONFIG_AXP_DCDC3_VOLT=1360 ++CONFIG_DM_RNG=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y diff --git a/dts/upstream/src/arm64/allwinner/sun50i-h618-kickpi-k2b.dts b/dts/upstream/src/arm64/allwinner/sun50i-h618-kickpi-k2b.dts new file mode 100644 -index 00000000000..95659012770 +index 00000000000..e452a4a35fa --- /dev/null +++ b/dts/upstream/src/arm64/allwinner/sun50i-h618-kickpi-k2b.dts -@@ -0,0 +1,315 @@ +@@ -0,0 +1,327 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2025 Patrick Yavitz @@ -149,8 +147,9 @@ index 00000000000..95659012770 + pinctrl-names = "default"; + phy-mode = "rgmii"; + phy-handle = <&ext_rgmii_phy>; ++ phy-supply = <®_dldo1>; + allwinner,tx-delay-ps = <700>; -+ allwinner,rx-delay-ps = <1700>; ++ allwinner,rx-delay-ps = <2000>; +}; + +&ehci0 { @@ -176,9 +175,9 @@ index 00000000000..95659012770 +}; + +&mdio0 { -+ ext_rgmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-id001c.c916"; -+ reg = <1>; ++ ext_rgmii_phy: ethernet-phy@0 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <0x0>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&pio 8 6 GPIO_ACTIVE_LOW>; /* PI6 */ @@ -309,6 +308,8 @@ index 00000000000..95659012770 + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; ++ regulator-step-delay-us = <25>; ++ regulator-final-delay-us = <50>; + regulator-name = "vcc-1v8-pll"; + }; + @@ -316,6 +317,8 @@ index 00000000000..95659012770 + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; ++ regulator-step-delay-us = <25>; ++ regulator-final-delay-us = <50>; + regulator-name = "vcc-3v3-io"; + }; + @@ -323,6 +326,8 @@ index 00000000000..95659012770 + regulator-always-on; + regulator-min-microvolt = <810000>; + regulator-max-microvolt = <990000>; ++ regulator-step-delay-us = <25>; ++ regulator-final-delay-us = <50>; + regulator-name = "vdd-gpu-sys"; + }; + @@ -330,13 +335,18 @@ index 00000000000..95659012770 + regulator-always-on; + regulator-min-microvolt = <810000>; + regulator-max-microvolt = <1100000>; ++ regulator-step-delay-us = <25>; ++ regulator-final-delay-us = <50>; ++ regulator-ramp-delay = <200>; /* FIXME */ + regulator-name = "vdd-cpu"; + }; + + reg_dcdc3: dcdc3 { + regulator-always-on; -+ regulator-min-microvolt = <1100000>; ++ regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; ++ regulator-step-delay-us = <25>; ++ regulator-final-delay-us = <50>; + regulator-name = "vdd-dram"; + }; + }; @@ -375,36 +385,3 @@ index 00000000000..95659012770 -- 2.43.0 -From 99cf1c27b0e94fee704f683ba0f338b239de6bdf Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Sun, 3 Aug 2025 09:13:29 -0400 -Subject: [PATCH] Enable KASLR - -Signed-off-by: Patrick Yavitz ---- - configs/kickpi_k2b_defconfig | 2 ++ - 1 files changed, 2 insertions(+) - -diff --git a/configs/kickpi_k2b_defconfig b/configs/kickpi_k2b_defconfig -index 912b4633dd1..578b5a799c9 100644 ---- a/configs/kickpi_k2b_defconfig -+++ b/configs/kickpi_k2b_defconfig -@@ -17,6 +17,7 @@ CONFIG_DRAM_CLK=792 - CONFIG_MMC_SUNXI_SLOT_EXTRA=2 - CONFIG_R_I2C_ENABLE=y - # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_CMD_KASLRSEED=y - CONFIG_SPL_I2C=y - CONFIG_SPL_SYS_I2C_LEGACY=y - CONFIG_SYS_I2C_MVTWSI=y -@@ -29,6 +30,7 @@ CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON=y - CONFIG_RGMII=y - CONFIG_RMII=y - CONFIG_AXP313_POWER=y -+CONFIG_DM_RNG=y - CONFIG_USB_EHCI_HCD=y - CONFIG_USB_OHCI_HCD=y - CONFIG_USB_MUSB_GADGET=y --- -2.43.0 - diff --git a/patch/u-boot/v2025.07/board_bananapim4zero/050-HACK-sunxi-h616-gpu-enable.patch b/patch/u-boot/v2026.01/board_bananapim4zero/010-HACK-sunxi-h616-gpu-enable.patch similarity index 55% rename from patch/u-boot/v2025.07/board_bananapim4zero/050-HACK-sunxi-h616-gpu-enable.patch rename to patch/u-boot/v2026.01/board_bananapim4zero/010-HACK-sunxi-h616-gpu-enable.patch index 5642bf9a8d..25986ae574 100644 --- a/patch/u-boot/v2025.07/board_bananapim4zero/050-HACK-sunxi-h616-gpu-enable.patch +++ b/patch/u-boot/v2026.01/board_bananapim4zero/010-HACK-sunxi-h616-gpu-enable.patch @@ -1,6 +1,6 @@ -From 4d113a1adecc24cd652214b6aa8fa1d600c04614 Mon Sep 17 00:00:00 2001 +From 2dda569d0b7193631cc21932b2ca5421b6787d88 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec -Date: Sat, 26 Jul 2025 11:06:30 -0400 +Date: Fri, 16 Jan 2026 09:05:06 -0500 Subject: [PATCH] HACK: sunxi: h616 gpu enable Signed-off-by: Jernej Skrabec @@ -9,18 +9,18 @@ Signed-off-by: Jernej Skrabec 1 file changed, 2 insertions(+) diff --git a/arch/arm/mach-sunxi/clock_sun50i_h6.c b/arch/arm/mach-sunxi/clock_sun50i_h6.c -index 4c522f60810..bb38dbb263b 100644 +index 80004f13a1e..d2986ec0b29 100644 --- a/arch/arm/mach-sunxi/clock_sun50i_h6.c +++ b/arch/arm/mach-sunxi/clock_sun50i_h6.c -@@ -13,6 +13,8 @@ void clock_init_safe(void) - /* this seems to enable PLLs on H616 */ - setbits_le32(prcm + CCU_PRCM_SYS_PWROFF_GATING, 0x10); - setbits_le32(prcm + CCU_PRCM_RES_CAL_CTRL, 2); +@@ -40,6 +40,8 @@ void clock_init_safe(void) + setbits_le32(prcm + CCU_PRCM_PLL_LDO_CFG, 0xA7000000); + /* set PLL VDD LDO output to 1.14 V */ + setbits_le32(prcm + CCU_PRCM_PLL_LDO_CFG, 0x60000); + /* enable GPU */ + writel(0, 0x7010254); } - if (IS_ENABLED(CONFIG_MACH_SUN50I_H616) || + clock_set_pll1(408000000); -- -2.43.0 +2.51.0 diff --git a/patch/u-boot/v2025.07/board_bananapim4zero/051-sunxi-h616-ths-workaround.patch b/patch/u-boot/v2026.01/board_bananapim4zero/011-sunxi-h616-ths-workaround.patch similarity index 78% rename from patch/u-boot/v2025.07/board_bananapim4zero/051-sunxi-h616-ths-workaround.patch rename to patch/u-boot/v2026.01/board_bananapim4zero/011-sunxi-h616-ths-workaround.patch index 87bb2f2278..fc38ddf5e2 100644 --- a/patch/u-boot/v2025.07/board_bananapim4zero/051-sunxi-h616-ths-workaround.patch +++ b/patch/u-boot/v2026.01/board_bananapim4zero/011-sunxi-h616-ths-workaround.patch @@ -1,6 +1,6 @@ -From ad10cf66b98acbdc21f431e262633e18b2e93c70 Mon Sep 17 00:00:00 2001 +From 081828ab9237d3d4f2005a622e8d86d6a662bfa8 Mon Sep 17 00:00:00 2001 From: Kali Prasad -Date: Sun, 24 Nov 2024 07:51:12 -0500 +Date: Fri, 16 Jan 2026 09:05:43 -0500 Subject: [PATCH] sunxi: h616 ths workaround Signed-off-by: Kali Prasad @@ -9,10 +9,10 @@ Signed-off-by: Kali Prasad 1 file changed, 9 insertions(+) diff --git a/board/sunxi/board.c b/board/sunxi/board.c -index 961cdcde74..af2b372a56 100644 +index 2929bc17f08..13ed2e2a4de 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c -@@ -225,6 +225,15 @@ int board_init(void) +@@ -230,6 +230,15 @@ int board_init(void) if (ret) return ret; @@ -29,5 +29,5 @@ index 961cdcde74..af2b372a56 100644 return 0; -- -2.39.5 +2.51.0 diff --git a/patch/u-boot/v2025.07/board_bananapim4zero/052-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch b/patch/u-boot/v2026.01/board_bananapim4zero/012-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch similarity index 100% rename from patch/u-boot/v2025.07/board_bananapim4zero/052-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch rename to patch/u-boot/v2026.01/board_bananapim4zero/012-mach-sunxi-dram_helpers-add-delay-to-steady-dram-detection.patch diff --git a/patch/u-boot/v2025.07/board_kickpik2b b/patch/u-boot/v2026.01/board_kickpik2b similarity index 100% rename from patch/u-boot/v2025.07/board_kickpik2b rename to patch/u-boot/v2026.01/board_kickpik2b