enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable "uboot-btrfs" extension

Browse Source
This commit is contained in:
Clark McCauley 2026-02-02 20:39:40 -07:00 committed by c0rnelius
parent 30e820adf2
commit 0ed771091f
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/boards/nanopi-r3s-lts.conf
View File

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

11
config/boards/nanopi-r3s.csc
View File

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