Skip to content

Commit 77a0772

Browse files
rpardiniigorpecovnik
authored andcommitted
nanopct6(-lts): u-boot: bump 2025.04 -> 2025.10-rc4
1 parent 8597096 commit 77a0772

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

config/boards/nanopct6.conf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ function post_family_config__nanopct6_use_mainline_uboot() {
4242
declare -g BOOTCONFIG="nanopc-t6-rk3588_defconfig"
4343
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
4444
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline
45-
declare -g BOOTBRANCH="tag:v2025.04"
46-
declare -g BOOTPATCHDIR="v2025.04"
45+
declare -g BOOTBRANCH="tag:v2025.10-rc4"
46+
declare -g BOOTPATCHDIR="v2025.10"
4747
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
4848
declare -g UBOOT_TARGET_MAP="BL31=bl31.elf ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
4949
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() {
7070
[[ "${BRANCH}" == "vendor" ]] && return 0 # Not for 'vendor' branch, which uses 2017.09 vendor u-boot from Radxa
7171

7272
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
73-
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
73+
# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
74+
cat <<- EOD >> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
7475
&u2phy0 { status = "okay"; };
7576
&u2phy0_otg { status = "okay"; };
7677
&usbdp_phy0 { status = "okay"; };
7778
&usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; };
7879
EOD
79-
# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
80-
# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
81-
# Append to the t6 u-boot dtsi file with stuff for enabling gadget/otg/peripheral mode
82-
8380
}
8481

8582
# "rockchip-common: boot SD card first, then NVMe, then mmc"

0 commit comments

Comments
 (0)