From a7a444f7bf91991643f7f047be0dad71f87b960e Mon Sep 17 00:00:00 2001
From: SuperKali <hello@superkali.me>
Date: Fri, 24 Oct 2025 09:26:33 +0200
Subject: [PATCH] board: youyeetoo-r1: correct minor typo on the config (#8817)

---
 config/boards/youyeetoo-r1-v3.csc | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/config/boards/youyeetoo-r1-v3.csc b/config/boards/youyeetoo-r1-v3.csc
index f04b080db6..76120c3fed 100644
--- a/config/boards/youyeetoo-r1-v3.csc
+++ b/config/boards/youyeetoo-r1-v3.csc
@@ -35,13 +35,13 @@ function post_family_tweaks__youyeetoo_r1_naming_udev_network_interfaces() {
 function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline (next branch) U-Boot for $BOARD / $BRANCH" "info"
 
-	declare -g BOOTCONFIG="youyeetoo-r1-rk3588s_defconfig"       # Use generic defconfig which should boot all RK3588 boards
+	declare -g BOOTCONFIG="youyeetoo-r1-rk3588s_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 U-Boot
 	declare -g BOOTBRANCH="tag:v2025.10"
 	declare -g BOOTPATCHDIR="v2025.10"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 
+	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
 	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
 
 	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
@@ -53,9 +53,8 @@ function post_family_config__youyeetoo_r1_use_mainline_uboot() {
 	}
 }
 
-# U-boot 2025.04+ can detect and set fdtfile automatically on youyeetoo r1 v3.
+# U-boot 2025.04+ can detect and set fdtfile automatically on Youyeetoo R1.
 # So if using mainline u-boot, unset BOOT_FDT_FILE to let u-boot handle it.
-# That way, both variants can boot from the same image; lets keep the -lts board file for vendor kernel/u-boot.
 function post_family_config__youyeetoo-r1-v3_auto_dtb_name_via_uboot_detection() {
 	unset BOOT_FDT_FILE
 }
@@ -64,7 +63,7 @@ function post_family_config__youyeetoo-r1-v3_auto_dtb_name_via_uboot_detection()
 # include/configs/rockchip-common.h
 # -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp"
 # +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp"
-# On youyeetoo R1, mmc0 is the SD card, mmc1 is the eMMC slot
+# On Youyeetoo R1, mmc0 is the SD card, mmc1 is the eMMC slot
 function pre_config_uboot_target__youyeetoo_r1_patch_rockchip_common_boot_order() {
 	declare -a rockchip_uboot_targets=("mmc0" "nvme" "mmc1" "scsi" "usb" "pxe" "dhcp") # for future make-this-generic delight
 	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
@@ -72,14 +71,17 @@ function pre_config_uboot_target__youyeetoo_r1_patch_rockchip_common_boot_order(
 	regular_git diff -u include/configs/rockchip-common.h || true
 }
 
+# Configure rtw89_8852be Wi-Fi driver to disable ASPM and power-save modes
+# for improved stability on mainline builds; skipped for the 'vendor' branch.
 function post_family_tweaks__youyeetoo_r1 {
-	if [[ "${BRANCH}" != "vendor" ]]; then
-		display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
-		cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
-			options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
-			options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y
-			options rtw89_core disable_ps_mode=y
-			options rtw89core disable_ps_mode=y
-		EOF
-	fi
+	[[ "${BRANCH}" == "vendor" ]] && return 0
+
+	display_alert "$BOARD" "Adjusting rtw89_8852be module" "info"
+	
+	cat <<- EOF > "${SDCARD}/etc/modprobe.d/rtw8852be.conf"
+		options rtw89_pci disable_aspm_l1=y disable_aspm_l1ss=y
+		options rtw89pci disable_aspm_l1=y disable_aspm_l1ss=y
+		options rtw89_core disable_ps_mode=y
+		options rtw89core disable_ps_mode=y
+	EOF
 }