Skip to content

Commit 58fee5e

Browse files
iaviav
committed
helios64: bump u-boot to v2026.04
1 parent 5c50706 commit 58fee5e

15 files changed

Lines changed: 2299 additions & 2 deletions

‎config/boards/helios64.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
55
BOARD_MAINTAINER="prahal"
66
INTRODUCED="2020"
77
BOOTCONFIG="helios64-rk3399_defconfig"
8-
BOOTBRANCH="tag:v2026.01"
9-
BOOTPATCHDIR="v2026.01/board_helios64"
8+
BOOTBRANCH="tag:v2026.04"
9+
BOOTPATCHDIR="v2026.04/board_helios64"
1010
BOOT_SCENARIO="binman-atf-mainline"
1111
DDR_BLOB="rk33/rk3399_ddr_933MHz_v1.25.bin"
1212
KERNEL_TARGET="current,edge"

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
config:
2+
3+
# Board-specific overlays live inside this directory to keep Helios64
4+
# patches self contained.
5+
overlay-directories:
6+
- { source: "defconfig", target: "configs" }
7+
- { source: "dt_upstream_rockchip", target: "dts/upstream/src/arm64/rockchip" }
8+
- { source: "dt_uboot", target: "arch/arm/dts" }
9+
- { source: "board", target: "board/kobol/helios64" }
10+
- { source: "include_configs", target: "include/configs" }

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Igor Velkov <325961+iav@users.noreply.github.com>
3+
Date: Thu, 25 Dec 2025 01:30:00 +0000
4+
Subject: [PATCH] exception: include string.h for strlen/strncmp
5+
6+
Fix implicit declarations in cmd/arm/exception64 by pulling in the
7+
standard string helpers.
8+
9+
---
10+
include/exception.h | 1 +
11+
1 file changed, 1 insertion(+)
12+
13+
diff --git a/include/exception.h b/include/exception.h
14+
index 0d27152ffa..e32eb833af 100644
15+
--- a/include/exception.h
16+
+++ b/include/exception.h
17+
@@ -7,6 +7,7 @@
18+
* Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk@gmx.de>
19+
*/
20+
21+
#include <command.h>
22+
+#include <string.h>
23+
24+
static int do_exception(struct cmd_tbl *cmdtp, int flag, int argc,
25+
char *const argv[])

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

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

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
if TARGET_HELIOS64
2+
3+
config SYS_BOARD
4+
default "helios64"
5+
6+
config SYS_VENDOR
7+
default "kobol"
8+
9+
config SYS_CONFIG_NAME
10+
default "helios64"
11+
12+
config BOARD_SPECIFIC_OPTIONS # dummy
13+
def_bool y
14+
15+
config ENV_SECT_SIZE
16+
default 0x1000 if ENV_IS_IN_SPI_FLASH
17+
18+
config ENV_SIZE
19+
default 0x8000
20+
21+
config ENV_OFFSET
22+
default 0x460000 if ENV_IS_IN_SPI_FLASH
23+
24+
endif

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
HELIOS64 BOARD
2+
M: Aditya Prayoga <aditya@kobol.io>
3+
S: Maintained
4+
F: board/kobol/helios64/
5+
F: include/configs/helios64.h
6+
F: configs/helios64-rk3399_defconfig

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0+
2+
#
3+
# Copyright (C) 2020 Aditya Prayoga <aditya@kobol.io>
4+
5+
obj-y := helios64.o sys_otp.o

0 commit comments

Comments
 (0)