helios64: u-boot: bump to v2026.04 + diagnostics + CMD_FILEENV; v2026.04: generic btrfs zstd fix

config/boards/helios64.conf

@@ -2,11 +2,11 @@
 BOARD_NAME="Helios64"
 BOARD_VENDOR="kobol"
 BOARDFAMILY="rockchip64" # Used to be rk3399
-BOARD_MAINTAINER="prahal"
+BOARD_MAINTAINER="iav prahal"
 INTRODUCED="2020"
 BOOTCONFIG="helios64-rk3399_defconfig"
-BOOTBRANCH="tag:v2026.01"
-BOOTPATCHDIR="v2026.01/board_helios64"
+BOOTBRANCH="tag:v2026.04"
+BOOTPATCHDIR="v2026.04/board_helios64"
 BOOT_SCENARIO="binman-atf-mainline"
 DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.25.bin"
 KERNEL_TARGET="current,edge"
@@ -25,6 +25,11 @@ if [[ "$ROOTFS_TYPE" =~ f2fs|nilfs2|nfs|xfs ]]; then
 	BOOTPART_REQUIRED=${BOOTPART_REQUIRED:-yes}
 fi
 
+function post_config_uboot_target__helios64_enable_fileenv() {
+	display_alert "u-boot for ${BOARD}" "enable CONFIG_CMD_FILEENV" "info"
+	run_host_command_logged scripts/config --enable CONFIG_CMD_FILEENV # added via cmd-fileenv-read-string-from-file-into-env.patch
+}
+
 function post_family_tweaks__helios64_enable_heartbeat() {
 	display_alert "$BOARD" "Installing board tweaks" "info"
 

patch/u-boot/v2026.04/board_helios64/0000.patching_config.yaml

@@ -0,0 +1,10 @@
+config:
+
+  # Board-specific overlays live inside this directory to keep Helios64
+  # patches self contained.
+  overlay-directories:
+    - { source: "defconfig", target: "configs" }
+    - { source: "dt_upstream_rockchip", target: "dts/upstream/src/arm64/rockchip" }
+    - { source: "dt_uboot", target: "arch/arm/dts" }
+    - { source: "board", target: "board/kobol/helios64" }
+    - { source: "include_configs", target: "include/configs" }

patch/u-boot/v2026.04/board_helios64/1000-exception-include-string.patch

@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Igor Velkov <325961+iav@users.noreply.github.com>
+Date: Thu, 25 Dec 2025 01:30:00 +0000
+Subject: [PATCH] exception: include string.h for strlen/strncmp
+
+Fix implicit declarations in cmd/arm/exception64 by pulling in the
+standard string helpers.
+
+---
+ include/exception.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/exception.h b/include/exception.h
+index 0d27152ffa..e32eb833af 100644
+--- a/include/exception.h
++++ b/include/exception.h
+@@ -7,6 +7,7 @@
+  * Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk@gmx.de>
+  */
+
+ #include <command.h>
++#include <string.h>
+
+ static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
+ 			char *const argv[])

patch/u-boot/v2026.04/board_helios64/1001-helios64-enable-target.patch

@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Igor Velkov <325961+iav@users.noreply.github.com>
+Date: Thu, 25 Dec 2025 01:30:00 +0000
+Subject: [PATCH] rk3399: add Helios64 target
+
+Wire Helios64 into the rk3399 board menu and source tree so its defconfig
+builds again on v2026.01-rc5. Based on work Aditya Prayoga <aditya@kobol.io>
+Tue, 15 Sep 2020 18:41:54 +0700
+
+---
+ arch/arm/mach-rockchip/rk3399/Kconfig | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
+index 39e5b0548d..2b5e169acd 100644
+--- a/arch/arm/mach-rockchip/rk3399/Kconfig
++++ b/arch/arm/mach-rockchip/rk3399/Kconfig
+@@ -130,6 +130,13 @@
+ 	   * wide voltage input(5V-15V), dual cell battery
+ 	   * Wifi/BT accessible via expansion board M.2
+
++config TARGET_HELIOS64
++	bool "Kobol Helios64"
++	help
++	  Helios64 is a RK3399-based NAS board with a JMB585 SATA HBA,
++	  USB-C (DP Alt), USB3 hub, dual Ethernet (1G + 2.5G), eMMC and
++	  LPDDR4 memory.
++
+ endchoice
+
+ config ROCKCHIP_BOOT_MODE_REG
+@@ -163,6 +170,7 @@ endif # BOOTCOUNT_LIMIT
+
+ source "board/firefly/roc-pc-rk3399/Kconfig"
+ source "board/google/gru/Kconfig"
++source "board/kobol/helios64/Kconfig"
+ source "board/pine64/pinebook-pro-rk3399/Kconfig"
+ source "board/pine64/pinephone-pro-rk3399/Kconfig"
+ source "board/pine64/rockpro64_rk3399/Kconfig"

patch/u-boot/v2026.04/board_helios64/board/Kconfig

@@ -0,0 +1,24 @@
+if TARGET_HELIOS64
+
+config SYS_BOARD
+	default "helios64"
+
+config SYS_VENDOR
+	default "kobol"
+
+config SYS_CONFIG_NAME
+	default "helios64"
+
+config BOARD_SPECIFIC_OPTIONS # dummy
+	def_bool y
+
+config ENV_SECT_SIZE
+	default 0x1000 if ENV_IS_IN_SPI_FLASH
+
+config ENV_SIZE
+	default 0x8000
+
+config ENV_OFFSET
+	default 0x3F8000 if ENV_IS_IN_SPI_FLASH
+
+endif

patch/u-boot/v2026.04/board_helios64/board/MAINTAINERS

@@ -0,0 +1,6 @@
+HELIOS64 BOARD
+M:	Aditya Prayoga <aditya@kobol.io>
+S:	Maintained
+F:	board/kobol/helios64/
+F:	include/configs/helios64.h
+F:	configs/helios64-rk3399_defconfig

patch/u-boot/v2026.04/board_helios64/board/Makefile

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2020 Aditya Prayoga <aditya@kobol.io>
+
+obj-y	:= helios64.o sys_otp.o