From 77a07720e7e46fc5fd48a0bdd3f08ea0db4c3b8f Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 20 Sep 2025 15:49:42 +0200 Subject: [PATCH] nanopct6(-lts): u-boot: bump 2025.04 -> 2025.10-rc4 --- config/boards/nanopct6.conf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/boards/nanopct6.conf b/config/boards/nanopct6.conf index 2dc95c3cd..d9b78230f 100644 --- a/config/boards/nanopct6.conf +++ b/config/boards/nanopct6.conf @@ -42,8 +42,8 @@ function post_family_config__nanopct6_use_mainline_uboot() { declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig" declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline - declare -g BOOTBRANCH="tag:v2025.04" - declare -g BOOTPATCHDIR="v2025.04" + declare -g BOOTBRANCH="tag:v2025.10-rc4" + declare -g BOOTPATCHDIR="v2025.10" declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin" unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already @@ -70,16 +70,13 @@ function pre_config_uboot_target__nanoptc6_patch_uboot_dtsi_for_ums() { [[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file - cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode + # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode + cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi &u2phy0 { status = "okay"; }; &u2phy0_otg { status = "okay"; }; &usbdp_phy0 { status = "okay"; }; &usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; }; EOD - # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode - # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode - # Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode - } # "rockchip-common: boot SD card first, then NVMe, then mmc"