armbian/build
0
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-01-06 09:58:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

nanopct6(-lts): u-boot: bump 2025.04 -> 2025.10-rc4

Browse Source
This commit is contained in:
Ricardo Pardini
2025-09-20 15:49:42 +02:00
committed by Igor
parent 8597096043
commit 77a07720e7
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/boards/nanopct6.conf
View File

@@ -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"