diff --git a/config/boards/nanopi-r3s-lts.conf b/config/boards/nanopi-r3s-lts.conf
index 177691abf9..c9ac0627a5 100644
--- a/config/boards/nanopi-r3s-lts.conf
+++ b/config/boards/nanopi-r3s-lts.conf
@@ -9,17 +9,9 @@ KERNEL_TEST_TARGET="current,edge"
 BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s-lts.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
+enable_extension "uboot-btrfs"
 
 function post_family_config__use_mainline_uboot() {
-
-	# Mainline U-Boot can read ext4 directly, so no separate boot partition needed for ext4 root
-	# However, for filesystems U-Boot cannot read (btrfs, f2fs, etc.), we need a boot partition
-	if [[ "$ROOTFS_TYPE" =~ btrfs|f2fs|nilfs2|xfs ]]; then
-		BOOTFS_TYPE=${BOOTFS_TYPE:-ext4}
-		BOOTSIZE=${BOOTSIZE:-512}
-	else
-		unset BOOTFS_TYPE  # ext4 root can be read directly by U-Boot
-	fi
 	BOOTCONFIG="nanopi-r3s-lts-rk3566_defconfig"
 	BOOTSOURCE="https://github.com/u-boot/u-boot"
 	BOOTBRANCH="tag:v2026.01"
diff --git a/config/boards/nanopi-r3s.csc b/config/boards/nanopi-r3s.csc
index cd73f61ddb..baf44980f4 100644
--- a/config/boards/nanopi-r3s.csc
+++ b/config/boards/nanopi-r3s.csc
@@ -10,7 +10,7 @@ KERNEL_TEST_TARGET="current,edge"
 BOOT_FDT_FILE="rockchip/rk3566-nanopi-r3s.dtb"
 IMAGE_PARTITION_TABLE="gpt"
 BOOT_SCENARIO="spl-blobs"
-
+enable_extension "uboot-btrfs"
 
 function post_family_config__use_mainline_uboot() {
 	if [[ "$BRANCH" == "vendor" ]]; then
@@ -18,15 +18,6 @@ function post_family_config__use_mainline_uboot() {
 	fi
 
 	unset BOOT_FDT_FILE # boot.scr will use whatever u-boot detects and sets 'fdtfile' to
-	
-	# Mainline U-Boot can read ext4 directly, so no separate boot partition needed for ext4 root
-	# However, for filesystems U-Boot cannot read (btrfs, f2fs, etc.), we need a boot partition
-	if [[ "$ROOTFS_TYPE" =~ btrfs|f2fs|nilfs2|xfs ]]; then
-		BOOTFS_TYPE=${BOOTFS_TYPE:-ext4}
-		BOOTSIZE=${BOOTSIZE:-512}
-	else
-		unset BOOTFS_TYPE  # ext4 root can be read directly by U-Boot
-	fi
 	BOOTCONFIG="nanopi-r3s-rk3566_defconfig"
 	BOOTSOURCE="https://github.com/u-boot/u-boot"
 	BOOTBRANCH="tag:v2025.04"