Skip to content

Commit ce584a7

Browse files
authored
board: youyeetoo-r1-v3: fix boot order to prioritize SD card over eMMC (#9006)
The device tree aliases show: - mmc0 = sdhci (eMMC, 8-bit, non-removable) - mmc1 = sdmmc (SD card, 4-bit, removable) Previous boot order (mmc0, nvme, mmc1) caused the system to always boot from eMMC when multiple storage devices were present, ignoring bootable SD cards. New boot order (mmc1, nvme, mmc0) now correctly prioritizes: 1. SD card 2. NVMe 3. eMMC This ensures consistent boot behavior when using SD card as primary boot device.
1 parent 7dbd7ca commit ce584a7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

config/boards/youyeetoo-r1-v3.csc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
5454
}
5555
}
5656

57-
# "rockchip-common: boot SD card first, then NVMe, then mmc"
57+
# "rockchip-common: boot SD card first, then NVMe, then eMMC"
5858
# include/configs/rockchip-common.h
59-
# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp"
60-
# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp"
61-
# On Youyeetoo R1, mmc0 is the SD card, mmc1 is the eMMC slot
59+
# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp" (default)
60+
# +#define BOOT_TARGETS "mmc1 nvme mmc0 scsi usb pxe dhcp"
61+
# On Youyeetoo R1, mmc0 is the eMMC (sdhci), mmc1 is the SD card (sdmmc)
6262
function pre_config_uboot_target__youyeetoo_r1_patch_rockchip_common_boot_order() {
63-
declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp") # for future make-this-generic delight
63+
declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "pxe" "dhcp") # mmc1=SD, mmc0=eMMC
6464
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
6565
sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
6666
regular_git diff -u include/configs/rockchip-common.h || true
@@ -72,7 +72,7 @@ function post_family_tweaks__youyeetoo_r1 {
7272
[[ "${BRANCH}" == "vendor" ]] && return 0
7373

7474
display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
75-
75+
7676
cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
7777
options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
7878
options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y

0 commit comments

Comments
 (0)