Merge pull request #2086 from loki666/uboot

sm8550/sm8650: bump u-boot to v2025.10
2026-03-31 14:41:55 -07:00 · 2025-11-29 15:08:04 +01:00
parent 7dc472c5a0 347124cfb5
commit fbe555acf0
13 changed files with 51 additions and 39 deletions
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/package.mk
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/package.mk
@@ -2,10 +2,10 @@
 # Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)

 PKG_NAME="u-boot"
-PKG_VERSION="6fc40f2499b1a517487933d7d81a482f6dce7751" # rb3g2-2025.04-rc5-laa-1
+PKG_VERSION="e50b1e8715011def8aff1588081a2649a2c6cd47" #v2025.10
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_URL="https://git.codelinaro.org/linaro/qcomlt/u-boot.git"
+PKG_URL="https://github.com/u-boot/u-boot.git"
 PKG_DEPENDS_TARGET="toolchain Python3 swig:host pyelftools:host gnutls:host"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 PKG_TOOLCHAIN="manual"
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0003-Add-ayn.env-file-and-modify-qcom_config.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0003-Add-ayn.env-file-and-modify-qcom_config.patch
@@ -37,32 +37,32 @@ index ce0f928ed9..fa079425dc 100644
 CONFIG_SYS_LOAD_ADDR=0xA0000000
 CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
 CONFIG_EFI_CAPSULE_ON_DISK=y
-@@ -13,7 +13,7 @@ CONFIG_BUTTON_CMD=y
- CONFIG_FIT=y
+@@ -13,7 +13,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTSTD_FULL=y
+ # CONFIG_BOOTMETH_VBE is not set
 -CONFIG_BOOTDELAY=1
 +CONFIG_BOOTDELAY=0
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
-@@ -52,7 +52,7 @@ CONFIG_PARTITION_TYPE_GUID=y
+@@ -52,7 +52,7 @@ CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
 CONFIG_OF_UPSTREAM_BUILD_VENDOR=y
- CONFIG_USE_DEFAULT_ENV_FILE=y
-CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env"
-+CONFIG_DEFAULT_ENV_FILE="board/qualcomm/ayn.env"
- CONFIG_PROT_TCP_SACK=y
- CONFIG_BUTTON_REMAP_PHONE_KEYS=y
+ CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
+-CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/default.env"
+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/ayn.env"
 CONFIG_BUTTON_QCOM_PMIC=y
-@@ -172,3 +172,13 @@ CONFIG_EFI_HTTP_BOOT=y
- CONFIG_USB_FUNCTION_FASTBOOT=y
- CONFIG_FASTBOOT_BUF_ADDR=0
- CONFIG_FASTBOOT_BUF_SIZE=0x10000000
+ CONFIG_CLK=y
+ CONFIG_CLK_STUB=y
+@@ -149,3 +149,13 @@ CONFIG_NO_FB_CLEAR=y
+ CONFIG_VIDEO_SIMPLE=y
+ CONFIG_WDT=y
+ CONFIG_WDT_QCOM=y
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_CMD_PAUSE=y
+CONFIG_BUTTON_REMAP_PHONE_KEYS=y
 +CONFIG_BOOTSTD=y
-+CONFIG_BOOTSTD_IGNORE_BOOTABLE=y
 +CONFIG_AUTOBOOT_KEYED=y
 +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"Volume Up\" to stop\n"
 +CONFIG_AUTOBOOT_STOP_STR="\x1b[A"
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0010-Add-AYN-Odin-Common-Device-Tree.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0010-Add-AYN-Odin-Common-Device-Tree.patch
@@ -579,8 +579,8 @@ index 0000000000..177dc8b93d
 +	no-sdio;
 +	no-mmc;
 +
-+	qcom,use-level-shifter;
 +	qcom,dll-config = <0x0007442c>;
+	resets = <&gcc GCC_SDCC2_BCR>;
 +
 +	status = "okay";
 +};
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0011-Add-AYANEO-Pocket-ACE-Device-Tree.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0011-Add-AYANEO-Pocket-ACE-Device-Tree.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 0000000000..177dc8b93d
 --- /dev/null
 +++ b/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ace.dts
-@@ -0,0 +1,656 @@
+@@ -0,0 +1,658 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -574,6 +574,8 @@ index 0000000000..177dc8b93d
 +	vmmc-supply = <&vreg_l9b_2p9>;
 +	vqmmc-supply = <&vreg_l8b_1p8>;
 +
+	resets = <&gcc GCC_SDCC2_BCR>;
+
 +	bus-width = <4>;
 +	no-sdio;
 +	no-mmc;
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0012-Add-AYANEO-Pocket-DMG-Device-Tree.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0012-Add-AYANEO-Pocket-DMG-Device-Tree.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 0000000000..177dc8b93d
 --- /dev/null
 +++ b/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-dmg.dts
-@@ -0,0 +1,656 @@
+@@ -0,0 +1,658 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -574,6 +574,8 @@ index 0000000000..177dc8b93d
 +	vmmc-supply = <&vreg_l9b_2p9>;
 +	vqmmc-supply = <&vreg_l8b_1p8>;
 +
+	resets = <&gcc GCC_SDCC2_BCR>;
+
 +	bus-width = <4>;
 +	no-sdio;
 +	no-mmc;
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0013-Add-AYANEO-Pocket-EVO-Device-Tree.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0013-Add-AYANEO-Pocket-EVO-Device-Tree.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 00000000..6f58c31a
 --- /dev/null
 +++ b/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-evo.dts
-@@ -0,0 +1,656 @@
+@@ -0,0 +1,658 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -574,6 +574,8 @@ index 00000000..6f58c31a
 +	vmmc-supply = <&vreg_l9b_2p9>;
 +	vqmmc-supply = <&vreg_l8b_1p8>;
 +
+	resets = <&gcc GCC_SDCC2_BCR>;
+
 +	bus-width = <4>;
 +	no-sdio;
 +	no-mmc;
--- a/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0014-Add-AYANEO-Pocket-DS-Device-Tree.patch
+++ b/projects/ROCKNIX/devices/SM8550/packages/u-boot/patches/0014-Add-AYANEO-Pocket-DS-Device-Tree.patch
@@ -1,7 +1,7 @@
 diff -rupbN u-boot.orig/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ds.dts u-boot/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ds.dts
 --- u-boot.orig/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ds.dts	1970-01-01 00:00:00.000000000 +0000
 +++ u-boot/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ds.dts	2025-08-28 21:12:17.047424292 +0000
-@@ -0,0 +1,656 @@
+@@ -0,0 +1,658 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -572,6 +572,8 @@ diff -rupbN u-boot.orig/dts/upstream/src/arm64/qcom/qcs8550-ayaneo-pocket-ds.dts
 +	vmmc-supply = <&vreg_l9b_2p9>;
 +	vqmmc-supply = <&vreg_l8b_1p8>;
 +
+	resets = <&gcc GCC_SDCC2_BCR>;
+
 +	bus-width = <4>;
 +	no-sdio;
 +	no-mmc;
--- a/projects/ROCKNIX/devices/SM8550/patches/linux/0200_arm64--dts--qcom--Add-AYN-QCS8550-Common.patch
+++ b/projects/ROCKNIX/devices/SM8550/patches/linux/0200_arm64--dts--qcom--Add-AYN-QCS8550-Common.patch
@@ -14,7 +14,7 @@ new file mode 100644
 index 000000000000..0954c1854a05
 --- /dev/null
 +++ b/arch/arm64/boot/dts/qcom/qcs8550-ayn-common.dtsi
-@@ -0,0 +1,1578 @@
+@@ -0,0 +1,1579 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -1291,6 +1291,7 @@ index 000000000000..0954c1854a05
 +	no-mmc;
 +
 +	qcom,dll-config = <0x0007442c>;
+	resets = <&gcc GCC_SDCC2_BCR>;
 +
 +	status = "okay";
 +};
--- a/projects/ROCKNIX/devices/SM8550/patches/linux/0210_arm64--dts--qcom--Add-AYANEO-Pocket-Common.patch
+++ b/projects/ROCKNIX/devices/SM8550/patches/linux/0210_arm64--dts--qcom--Add-AYANEO-Pocket-Common.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 000000000000..58d9ab342fe9
 --- /dev/null
 +++ b/arch/arm64/boot/dts/qcom/qcs8550-ayaneo-pocket-common.dtsi
-@@ -0,0 +1,1473 @@
+@@ -0,0 +1,1474 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2025, Teguh Sobirin.
@@ -1060,6 +1060,7 @@ index 000000000000..58d9ab342fe9
 +	no-mmc;
 +
 +	qcom,dll-config = <0x0007442c>;
+	resets = <&gcc GCC_SDCC2_BCR>;
 +
 +	status = "okay";
 +};
--- a/projects/ROCKNIX/devices/SM8650/packages/u-boot/package.mk
+++ b/projects/ROCKNIX/devices/SM8650/packages/u-boot/package.mk
@@ -2,10 +2,10 @@
 # Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)

 PKG_NAME="u-boot"
-PKG_VERSION="6fc40f2499b1a517487933d7d81a482f6dce7751" # rb3g2-2025.04-rc5-laa-1
+PKG_VERSION="e50b1e8715011def8aff1588081a2649a2c6cd47" #v2025.10
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
-PKG_URL="https://git.codelinaro.org/linaro/qcomlt/u-boot.git"
+PKG_URL="https://github.com/u-boot/u-boot.git"
 PKG_DEPENDS_TARGET="toolchain Python3 swig:host pyelftools:host gnutls:host"
 PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems."
 PKG_TOOLCHAIN="manual"
--- a/projects/ROCKNIX/devices/SM8650/packages/u-boot/patches/0003-Add-bootefi.env-file-and-modify-qcom_config.patch
+++ b/projects/ROCKNIX/devices/SM8650/packages/u-boot/patches/0003-Add-bootefi.env-file-and-modify-qcom_config.patch
@@ -25,32 +25,32 @@ index ce0f928ed9..fa079425dc 100644
 CONFIG_SYS_LOAD_ADDR=0xA0000000
 CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
 CONFIG_EFI_CAPSULE_ON_DISK=y
-@@ -13,7 +13,7 @@ CONFIG_BUTTON_CMD=y
- CONFIG_FIT=y
+@@ -13,7 +13,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTSTD_FULL=y
+ # CONFIG_BOOTMETH_VBE is not set
 -CONFIG_BOOTDELAY=1
 +CONFIG_BOOTDELAY=0
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
-@@ -52,7 +52,7 @@ CONFIG_PARTITION_TYPE_GUID=y
+@@ -52,7 +52,7 @@ CONFIG_CMD_LOG=y
 CONFIG_OF_LIVE=y
 CONFIG_OF_UPSTREAM_BUILD_VENDOR=y
- CONFIG_USE_DEFAULT_ENV_FILE=y
-CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env"
-+CONFIG_DEFAULT_ENV_FILE="board/qualcomm/bootefi.env"
- CONFIG_PROT_TCP_SACK=y
- CONFIG_BUTTON_REMAP_PHONE_KEYS=y
+ CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y
+-CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/default.env"
+CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="board/qualcomm/bootefi.env"
 CONFIG_BUTTON_QCOM_PMIC=y
-@@ -172,3 +172,13 @@ CONFIG_EFI_HTTP_BOOT=y
- CONFIG_USB_FUNCTION_FASTBOOT=y
- CONFIG_FASTBOOT_BUF_ADDR=0
- CONFIG_FASTBOOT_BUF_SIZE=0x10000000
+ CONFIG_CLK=y
+ CONFIG_CLK_STUB=y
+@@ -149,3 +149,13 @@ CONFIG_NO_FB_CLEAR=y
+ CONFIG_VIDEO_SIMPLE=y
+ CONFIG_WDT=y
+ CONFIG_WDT_QCOM=y
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +CONFIG_CMD_PAUSE=y
+CONFIG_BUTTON_REMAP_PHONE_KEYS=y
 +CONFIG_BOOTSTD=y
-+CONFIG_BOOTSTD_IGNORE_BOOTABLE=y
 +CONFIG_AUTOBOOT_KEYED=y
 +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"Volume Up\" to stop\n"
 +CONFIG_AUTOBOOT_STOP_STR="\x1b[A"
--- a/projects/ROCKNIX/devices/SM8650/packages/u-boot/patches/0010-add-AYANEO-Pocket-S2-dts.patch
+++ b/projects/ROCKNIX/devices/SM8650/packages/u-boot/patches/0010-add-AYANEO-Pocket-S2-dts.patch
@@ -552,7 +552,7 @@ index 000000000000..681ded735fe4
 +	no-sdio;
 +	no-mmc;
 +
-+	max-sd-hs-hz = <37500000>;
+	resets = <&gcc GCC_SDCC2_BCR>;
 +	qcom,dll-config = <0x0007442c>;
 +
 +	pinctrl-0 = <&sdc2_default>, <&sdc2_card_det_n>;
--- a/projects/ROCKNIX/devices/SM8650/patches/linux/0001-add-ayaneo-pocket-s2-dts.patch
+++ b/projects/ROCKNIX/devices/SM8650/patches/linux/0001-add-ayaneo-pocket-s2-dts.patch
@@ -3,7 +3,7 @@ new file mode 100644
 index 000000000000..681ded735fe4
 --- /dev/null
 +++ b/arch/arm64/boot/dts/qcom/sm8650-ayaneo-ps2.dts
-@@ -0,0 +1,1732 @@
+@@ -0,0 +1,1734 @@
 +// SPDX-License-Identifier: BSD-3-Clause
 +/*
 + * Copyright (c) 2023, Linaro Limited
@@ -1375,6 +1375,8 @@ index 000000000000..681ded735fe4
 +	no-sdio;
 +	no-mmc;
 +
+	resets = <&gcc GCC_SDCC2_BCR>;
+
 +	pinctrl-0 = <&sdc2_default>, <&sdc2_card_det_n>;
 +	pinctrl-1 = <&sdc2_sleep>, <&sdc2_card_det_n>;
 +	pinctrl-names = "default", "sleep";