khadas-vim3l: u-boot: bump to v2026.01-rc2, enable BTRFS and more

- boot order: SD -> NVMe -> USB -> eMMC -> PXE
- NVMe must come before USB, as initting USB kills NVMe

Author: rpardini

config/boards/khadas-vim3l.conf

@@ -12,8 +12,8 @@ BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-sm1-khadas-vim3l.dtb"
 ASOUND_STATE="asound.state.khadas-vim3l"
 
-BOOTBRANCH_BOARD="tag:v2024.01"
-BOOTPATCHDIR="v2024.01" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
+BOOTBRANCH_BOARD="tag:v2026.01-rc2"
+BOOTPATCHDIR="v2026.01" # this has 'board_khadas-vim3' which has a patch to boot USB/NVMe/SCSI first
 
 declare -g KHADAS_OOWOW_BOARD_ID="VIM3L" # for use with EXT=output-image-oowow
 
@@ -44,15 +44,30 @@ function post_uboot_custom_postprocess__khadas_vim3l_uboot() {
 
 # Enable extra u-boot .config options, this way we avoid patching defconfig
 function post_config_uboot_target__extra_configs_for_khadas_vim3l() {
+	display_alert "u-boot for ${BOARD}" "u-boot: enable EFI debugging command" "info"
+	run_host_command_logged scripts/config --enable CMD_EFIDEBUG
+	run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI
+
+	display_alert "u-boot for ${BOARD}" "u-boot: enable I2C support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_DM_I2C
+	run_host_command_logged scripts/config --enable CONFIG_SYS_I2C_MESON
+	run_host_command_logged scripts/config --enable CONFIG_CMD_I2C
+
+	display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more filesystems support" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_BTRFS
+
 	display_alert "u-boot for ${BOARD}" "u-boot: enable more compression support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LZO
 	run_host_command_logged scripts/config --enable CONFIG_BZIP2
 	run_host_command_logged scripts/config --enable CONFIG_ZSTD
+
 	display_alert "u-boot for ${BOARD}" "u-boot: enable kaslrseed support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_CMD_KASLRSEED
+
 	display_alert "u-boot for ${BOARD}" "u-boot: enable gpio LED support" "info"
 	run_host_command_logged scripts/config --enable CONFIG_LED
 	run_host_command_logged scripts/config --enable CONFIG_LED_GPIO
+
 	display_alert "u-boot for ${BOARD}" "u-boot: enable networking cmds" "info"
 	run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
 	run_host_command_logged scripts/config --enable CONFIG_CMD_WGET

patch/u-boot/v2024.01/board_khadas-vim3l/meson64-boot-usb-nvme-scsi-first.patch renamed to patch/u-boot/v2026.01/board_khadas-vim3l/kvim3l-boot-usb-sata-sd.patch

@@ -1,32 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ricardo Pardini <[email protected]>
-Date: Sun, 14 Jan 2024 13:44:58 +0100
-Subject: meson64: change `BOOT_TARGET_DEVICES` to try to boot USB, NVME and
- SCSI before SD, MMC, PXE, DHCP
+Date: Sat, 15 Nov 2025 00:04:36 +0100
+Subject: kvim3l: boot order: SD -> NVME -> USB -> eMMC -> PXE
 
 ---
- include/configs/meson64.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ include/configs/meson64.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/meson64.h b/include/configs/meson64.h
-index efab9a624dc5..32c25098e674 100644
+index f3275b37a51..85b06c0579d 100644
 --- a/include/configs/meson64.h
 +++ b/include/configs/meson64.h
-@@ -99,12 +99,12 @@
+@@ -119,10 +119,12 @@
  #define BOOT_TARGET_DEVICES(func) \
  	func(ROMUSB, romusb, na)  \
  	func(USB_DFU, usbdfu, na)  \
--	func(MMC, mmc, 0) \
--	func(MMC, mmc, 1) \
--	func(MMC, mmc, 2) \
- 	BOOT_TARGET_DEVICES_USB(func) \
+-	BOOT_TARGET_MMC(func) \
+-	BOOT_TARGET_DEVICES_USB(func) \
++	func(MMC, mmc, 1) \
  	BOOT_TARGET_NVME(func) \
++	BOOT_TARGET_DEVICES_USB(func) \
  	BOOT_TARGET_SCSI(func) \
-+	func(MMC, mmc, 0) \
-+	func(MMC, mmc, 1) \
 +	func(MMC, mmc, 2) \
- 	func(PXE, pxe, na) \
- 	func(DHCP, dhcp, na)
++	func(MMC, mmc, 0) \
+ 	BOOT_TARGET_PXE(func) \
+ 	BOOT_TARGET_DHCP(func)
  #endif
 -- 
 Armbian