Hi,
This updates rk356x to 2025-07. I don't particularly like updating U-Boot,
but since the TPL (version 1.18) and BL31 (version 1.43) files are currently
missing, and a new U-Boot version happened to be released this month,
I decided to update it.
I could have root installed on the nvme on the ROCK 3A and boot the
Quartz64 model B from an uSD card.
ok?
Index: sysutils/u-boot/rk356x/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/rk356x/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- sysutils/u-boot/rk356x/Makefile 21 Dec 2024 11:38:54 -0000 1.6
+++ sysutils/u-boot/rk356x/Makefile 21 Jul 2025 06:02:12 -0000
@@ -1,5 +1,4 @@
-VERSION= 2024.01
-REVISION= 0
+VERSION= 2025.07
SOC= rk356x
@@ -23,13 +22,14 @@ BOARDS=\
BUILD_DEPENDS+= devel/arm-none-eabi/gcc,aarch64 \
devel/py-elftools \
+ security/gnutls \
shells/bash \
sysutils/e2fsprogs
CROSS_COMPILE= aarch64-none-elf-
-RK3566_TPL= rk3566_ddr_1056MHz_v1.18.bin
-RK3568_TPL= rk3568_ddr_1560MHz_v1.18.bin
-RK356X_BL31= rk3568_bl31_v1.43.elf
+RK3566_TPL= rk3566_ddr_1056MHz_v1.23.bin
+RK3568_TPL= rk3568_ddr_1560MHz_v1.23.bin
+RK356X_BL31= rk3568_bl31_v1.44.elf
DISTFILES.rkbin= ${RK3566_TPL} ${RK3568_TPL} ${RK356X_BL31}
SITES.rkbin= https://github.com/rockchip-linux/rkbin/raw/master/bin/rk35/
Index: sysutils/u-boot/rk356x/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/rk356x/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- sysutils/u-boot/rk356x/distinfo 17 Feb 2024 11:27:42 -0000 1.2
+++ sysutils/u-boot/rk356x/distinfo 21 Jul 2025 06:02:12 -0000
@@ -1,8 +1,8 @@
-SHA256 (rk3566_ddr_1056MHz_v1.18.bin) =
3ABjVq4NHR9mhYo3Yub1pSlMruHKFz7lsMRTG9QgjU8=
-SHA256 (rk3568_bl31_v1.43.elf) = U7k3G+6qDGo8AjWg8Gmtxxn/kCinhjdyzl7vJBVqsHw=
-SHA256 (rk3568_ddr_1560MHz_v1.18.bin) =
nmIAyhP4RjebrnA7A21C4oCIirOoFDmZOAvcmJjQQyI=
-SHA256 (u-boot-2024.01.tar.bz2) = uZYR8e0je/NUG9yENLaMlqbgWWcGH5kkQ8swqr6+9bM=
-SIZE (rk3566_ddr_1056MHz_v1.18.bin) = 55296
-SIZE (rk3568_bl31_v1.43.elf) = 402376
-SIZE (rk3568_ddr_1560MHz_v1.18.bin) = 55296
-SIZE (u-boot-2024.01.tar.bz2) = 19926911
+SHA256 (rk3566_ddr_1056MHz_v1.23.bin) =
IOS7B2hHvQGfzet73BW9JJiQ8H7MdumTcQHyLlCVCYI=
+SHA256 (rk3568_bl31_v1.44.elf) = ZREPgi/b3QFjzi2rxgWR56ig/7yUcXgOKe7wBi+e17Y=
+SHA256 (rk3568_ddr_1560MHz_v1.23.bin) =
A5+8OspJbuqq81VXIC++Q9AFw6KNfXuHYlSxOZYIZ68=
+SHA256 (u-boot-2025.07.tar.bz2) = D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc=
+SIZE (rk3566_ddr_1056MHz_v1.23.bin) = 59392
+SIZE (rk3568_bl31_v1.44.elf) = 402376
+SIZE (rk3568_ddr_1560MHz_v1.23.bin) = 59392
+SIZE (u-boot-2025.07.tar.bz2) = 33516210
Index: sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk3568_dtsi
===================================================================
RCS file: sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk3568_dtsi
diff -N sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk3568_dtsi
--- sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk3568_dtsi 24 Nov
2023 20:41:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: arch/arm/dts/rk3568.dtsi
---- arch/arm/dts/rk3568.dtsi.orig
-+++ arch/arm/dts/rk3568.dtsi
-@@ -97,7 +97,7 @@
- <0x0 0xf2000000 0x0 0x00100000>;
- ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0
0x00100000>,
- <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0
0x01e00000>,
-- <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0
0x40000000>;
-+ <0x03000000 0x3 0x40000000 0x3 0x40000000 0x0
0x40000000>;
- reg-names = "dbi", "apb", "config";
- resets = <&cru SRST_PCIE30X1_POWERUP>;
- reset-names = "pipe";
-@@ -150,7 +150,7 @@
- <0x0 0xf0000000 0x0 0x00100000>;
- ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0
0x00100000>,
- <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0
0x01e00000>,
-- <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0
0x40000000>;
-+ <0x03000000 0x3 0x80000000 0x3 0x80000000 0x0
0x40000000>;
- reg-names = "dbi", "apb", "config";
- resets = <&cru SRST_PCIE30X2_POWERUP>;
- reset-names = "pipe";
Index: sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk356x_dtsi
===================================================================
RCS file: sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk356x_dtsi
diff -N sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk356x_dtsi
--- sysutils/u-boot/rk356x/patches/patch-arch_arm_dts_rk356x_dtsi 24 Nov
2023 20:41:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: arch/arm/dts/rk356x.dtsi
---- arch/arm/dts/rk356x.dtsi.orig
-+++ arch/arm/dts/rk356x.dtsi
-@@ -984,7 +984,7 @@
- power-domains = <&power RK3568_PD_PIPE>;
- ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0
0x00100000>,
- <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0
0x01e00000>,
-- <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0
0x40000000>;
-+ <0x03000000 0x3 0x00000000 0x3 0x00000000 0x0
0x40000000>;
- resets = <&cru SRST_PCIE20_POWERUP>;
- reset-names = "pipe";
- #address-cells = <3>;
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-anbernic-rgxx3_dtsi
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-anbernic-rgxx3_dtsi
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-anbernic-rgxx3_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-anbernic-rgxx3_dtsi
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3566-anbernic-rgxx3.dtsi
+--- dts/upstream/src/arm64/rockchip/rk3566-anbernic-rgxx3.dtsi.orig
++++ dts/upstream/src/arm64/rockchip/rk3566-anbernic-rgxx3.dtsi
+@@ -13,7 +13,7 @@
+ chassis-type = "handset";
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ adc_keys: adc-keys {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-a_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-a_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-a_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-a_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3566-quartz64-a.dts
+--- dts/upstream/src/arm64/rockchip/rk3566-quartz64-a.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3566-quartz64-a.dts
+@@ -18,7 +18,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ gmac1_clkin: external-gmac1-clock {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-b_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-b_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-b_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3566-quartz64-b_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3566-quartz64-b.dts
+--- dts/upstream/src/arm64/rockchip/rk3566-quartz64-b.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3566-quartz64-b.dts
+@@ -19,7 +19,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ gmac1_clkin: external-gmac1-clock {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-bpi-r2-pro_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-bpi-r2-pro_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-bpi-r2-pro_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-bpi-r2-pro_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568-bpi-r2-pro.dts
+--- dts/upstream/src/arm64/rockchip/rk3568-bpi-r2-pro.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3568-bpi-r2-pro.dts
+@@ -23,7 +23,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ leds {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-evb1-v10_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-evb1-v10_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-evb1-v10_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-evb1-v10_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568-evb1-v10.dts
+--- dts/upstream/src/arm64/rockchip/rk3568-evb1-v10.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3568-evb1-v10.dts
+@@ -23,7 +23,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ dc_12v: regulator-dc-12v {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-nanopi-r5s_dtsi
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-nanopi-r5s_dtsi
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-nanopi-r5s_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-nanopi-r5s_dtsi
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568-nanopi-r5s.dtsi
+--- dts/upstream/src/arm64/rockchip/rk3568-nanopi-r5s.dtsi.orig
++++ dts/upstream/src/arm64/rockchip/rk3568-nanopi-r5s.dtsi
+@@ -21,7 +21,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ hdmi-con {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-odroid-m1_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-odroid-m1_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-odroid-m1_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-odroid-m1_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568-odroid-m1.dts
+--- dts/upstream/src/arm64/rockchip/rk3568-odroid-m1.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3568-odroid-m1.dts
+@@ -26,7 +26,7 @@
+ };
+
+ chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ dc_12v: regulator-dc-12v {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-rock-3a_dts
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-rock-3a_dts
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-rock-3a_dts
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568-rock-3a_dts
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts
+--- dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts.orig
++++ dts/upstream/src/arm64/rockchip/rk3568-rock-3a.dts
+@@ -19,7 +19,7 @@
+ };
+
+ chosen: chosen {
+- stdout-path = "serial2:1500000n8";
++ stdout-path = "serial2:115200n8";
+ };
+
+ hdmi-con {
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568_dtsi
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568_dtsi
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk3568_dtsi
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,21 @@
+Index: dts/upstream/src/arm64/rockchip/rk3568.dtsi
+--- dts/upstream/src/arm64/rockchip/rk3568.dtsi.orig
++++ dts/upstream/src/arm64/rockchip/rk3568.dtsi
+@@ -185,7 +185,7 @@
+ <0x0 0xf2000000 0x0 0x00100000>;
+ ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0
0x00100000>,
+ <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0
0x01e00000>,
+- <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0
0x40000000>;
++ <0x03000000 0x3 0x40000000 0x3 0x40000000 0x0
0x40000000>;
+ reg-names = "dbi", "apb", "config";
+ resets = <&cru SRST_PCIE30X1_POWERUP>;
+ reset-names = "pipe";
+@@ -238,7 +238,7 @@
+ <0x0 0xf0000000 0x0 0x00100000>;
+ ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0
0x00100000>,
+ <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0
0x01e00000>,
+- <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0
0x40000000>;
++ <0x03000000 0x3 0x40000000 0x3 0x80000000 0x0
0x40000000>;
+ reg-names = "dbi", "apb", "config";
+ resets = <&cru SRST_PCIE30X2_POWERUP>;
+ reset-names = "pipe";
Index:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk356x-base_dtsi
===================================================================
RCS file:
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk356x-base_dtsi
diff -N
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk356x-base_dtsi
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
sysutils/u-boot/rk356x/patches/patch-dts_upstream_src_arm64_rockchip_rk356x-base_dtsi
21 Jul 2025 06:02:12 -0000
@@ -0,0 +1,12 @@
+Index: dts/upstream/src/arm64/rockchip/rk356x-base.dtsi
+--- dts/upstream/src/arm64/rockchip/rk356x-base.dtsi.orig
++++ dts/upstream/src/arm64/rockchip/rk356x-base.dtsi
+@@ -964,7 +964,7 @@
+ power-domains = <&power RK3568_PD_PIPE>;
+ ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0
0x00100000>,
+ <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0
0x01e00000>,
+- <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0
0x40000000>;
++ <0x03000000 0x3 0x40000000 0x3 0x00000000 0x0
0x40000000>;
+ resets = <&cru SRST_PCIE20_POWERUP>;
+ reset-names = "pipe";
+ #address-cells = <3>;
Index: sysutils/u-boot/rk356x/patches/patch-tools_rkcommon_c
===================================================================
RCS file: /cvs/ports/sysutils/u-boot/rk356x/patches/patch-tools_rkcommon_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tools_rkcommon_c
--- sysutils/u-boot/rk356x/patches/patch-tools_rkcommon_c 14 Apr 2024
04:21:30 -0000 1.1
+++ sysutils/u-boot/rk356x/patches/patch-tools_rkcommon_c 21 Jul 2025
06:02:12 -0000
@@ -3,7 +3,7 @@ Add endian swaps for BE_ARCHS.
Index: tools/rkcommon.c
--- tools/rkcommon.c.orig
+++ tools/rkcommon.c
-@@ -454,7 +454,7 @@ int rkcommon_verify_header(unsigned char *buf, int siz
+@@ -456,7 +456,7 @@ int rkcommon_verify_header(unsigned char *buf, int siz
int ret;
/* spl_hdr is abandon on header_v2 */
@@ -12,7 +12,7 @@ Index: tools/rkcommon.c
return 0;
ret = rkcommon_parse_header(buf, &header0, &img_spl_info);
-@@ -489,7 +489,7 @@ void rkcommon_print_header(const void *buf, struct ima
+@@ -491,7 +491,7 @@ void rkcommon_print_header(const void *buf, struct ima
uint8_t image_type;
int ret, boot_size, init_size;
