Skip to content

Commit d8830d5

Browse files
rpardiniigorpecovnik
authored andcommitted
mixtile-blade3: edge: u-boot: bump to v2026.01; boot order; symlinked DT
- fix bootorder (SD -> NVMe -> eMMC); USB disabled as nonworking with mainline still - use the DT from rockchip64-6.18 so a single source for both u-boot and kernel - note: the first (and only) RTL8169 used by u-boot is the port closest to board edge
1 parent 9c4f8fa commit d8830d5

5 files changed

Lines changed: 17 additions & 773 deletions

File tree

config/boards/mixtile-blade3.csc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ function post_family_config__blade3_use_mainline_uboot() {
4040
declare -g BOOTDELAY=1
4141

4242
BOOTSOURCE="https://github.com/u-boot/u-boot.git"
43-
BOOTBRANCH="tag:v2025.10"
44-
BOOTPATCHDIR="v2025.10" # with 000.patching_config.yaml - no patching, straight .dts/defconfigs et al
43+
declare -g BOOTBRANCH="tag:v2026.01"
44+
declare -g BOOTPATCHDIR="v2026.01" # with 000.patching_config.yaml - no patching, straight .dts/defconfigs et al
4545

4646
BOOTDIR="u-boot-${BOARD}"
4747

@@ -53,12 +53,24 @@ function post_family_config__blade3_use_mainline_uboot() {
5353
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
5454
}
5555

56-
# @TODO: boot order stuff; we want to boot nvme / usb / sd before eMMC
57-
5856
declare -g PLYMOUTH="no" # Disable plymouth as that only causes more confusion
5957
}
6058

6159
function post_family_config_branch_edge__different_dtb_for_edge() {
6260
declare -g BOOT_FDT_FILE="rockchip/rk3588-mixtile-blade3.dtb"
6361
display_alert "$BOARD" "Using ${BOOT_FDT_FILE} for ${BRANCH}" "warn"
6462
}
63+
64+
# "rockchip-common: boot SD card first, then NVMe, then mmc"
65+
# include/configs/rockchip-common.h
66+
# On the mixtile-blade3: mmc0 is eMMC; mmc1 is microSD
67+
# Also the usb is non-functional in mainline u-boot right now, so we skip: "scsi" "usb"
68+
function pre_config_uboot_target__blade3_patch_rockchip_common_boot_order() {
69+
if [[ "${BRANCH}" != "edge" ]]; then
70+
return 0
71+
fi
72+
declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "pxe" "dhcp" "spi") # for future make-this-generic delight
73+
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
74+
sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
75+
regular_git diff -u include/configs/rockchip-common.h || true
76+
}

0 commit comments

Comments
 (0)