From: Patrick Wildt Subject: Update RK3588-specific U-Boot to 2025.07 To: ports@openbsd.org Cc: kettenis@openbsd.org Date: Fri, 1 Aug 2025 19:27:47 +0200 Hi, this updates the RK3588-specific U-Boot to 2025.07. I'm successfully running it on my NanoPi R6C. Please give it a try on some of your RK3588 boxes. The patch updates are fairly simple: * R6S (and R6C) baudrate are now in a common DTSI. * Orange Pi 5 (and Plus) baudrate are now in a common DTSI. Cheers, Patrick diff --git a/sysutils/u-boot/rk3588/Makefile b/sysutils/u-boot/rk3588/Makefile index 00f3e08f4f2..47bbfbc400a 100644 --- a/sysutils/u-boot/rk3588/Makefile +++ b/sysutils/u-boot/rk3588/Makefile @@ -1,5 +1,4 @@ -VERSION= 2025.01 -REVISION= 0 +VERSION= 2025.07 SOC= rk3588 diff --git a/sysutils/u-boot/rk3588/distinfo b/sysutils/u-boot/rk3588/distinfo index a0632a4dc33..71e7a807bf9 100644 --- a/sysutils/u-boot/rk3588/distinfo +++ b/sysutils/u-boot/rk3588/distinfo @@ -1,6 +1,6 @@ SHA256 (rk3588_bl31_v1.48.elf) = /3F4B9hzzpXlRjrCngtfCB+MWVbVf0A3aho/4PuTrM8= SHA256 (rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin) = 2J1AqBg7CZWJv8/8XMLOnYdOtbHRm3i9rSz89Fucto8= -SHA256 (u-boot-2025.01.tar.bz2) = ze99UHyT8bvZ8BXqm8IfoHQmhIFAVQGUWrxvhU1baG8= +SHA256 (u-boot-2025.07.tar.bz2) = D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc= SIZE (rk3588_bl31_v1.48.elf) = 430880 SIZE (rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin) = 75320 -SIZE (u-boot-2025.01.tar.bz2) = 32890299 +SIZE (u-boot-2025.07.tar.bz2) = 33516210 diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-nanopc-t6_dtsi b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-nanopc-t6_dtsi index 8896b71fd9f..7a5dfff7ab5 100644 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-nanopc-t6_dtsi +++ b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-nanopc-t6_dtsi @@ -1,7 +1,7 @@ Index: dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi --- dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi.orig +++ dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi -@@ -22,7 +22,7 @@ +@@ -38,7 +38,7 @@ }; chosen { @@ -9,4 +9,4 @@ Index: dts/upstream/src/arm64/rockchip/rk3588-nanopc-t6.dtsi + stdout-path = "serial2:115200n8"; }; - leds { + hdmi0-con { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5-plus_dts b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5-plus_dts deleted file mode 100644 index 9fc8298c26e..00000000000 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5-plus_dts +++ /dev/null @@ -1,12 +0,0 @@ -Index: dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-plus.dts ---- dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-plus.dts.orig -+++ dts/upstream/src/arm64/rockchip/rk3588-orangepi-5-plus.dts -@@ -22,7 +22,7 @@ - }; - - chosen { -- stdout-path = "serial2:1500000n8"; -+ stdout-path = "serial2:115200n8"; - }; - - adc-keys-0 { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5_dtsi b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5_dtsi new file mode 100644 index 00000000000..e01714ad80b --- /dev/null +++ b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-orangepi-5_dtsi @@ -0,0 +1,12 @@ +Index: dts/upstream/src/arm64/rockchip/rk3588-orangepi-5.dtsi +--- dts/upstream/src/arm64/rockchip/rk3588-orangepi-5.dtsi.orig ++++ dts/upstream/src/arm64/rockchip/rk3588-orangepi-5.dtsi +@@ -19,7 +19,7 @@ + }; + + chosen { +- stdout-path = "serial2:1500000n8"; ++ stdout-path = "serial2:115200n8"; + }; + + adc-keys-0 { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-rock-5b_dts b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-rock-5b_dts index 7f5a113eac7..29ec2ae9b8c 100644 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-rock-5b_dts +++ b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588-rock-5b_dts @@ -1,7 +1,7 @@ Index: dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts --- dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts.orig +++ dts/upstream/src/arm64/rockchip/rk3588-rock-5b.dts -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ }; chosen { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6_dtsi b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6_dtsi new file mode 100644 index 00000000000..8754d57d5e0 --- /dev/null +++ b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6_dtsi @@ -0,0 +1,12 @@ +Index: dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6.dtsi +--- dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6.dtsi.orig ++++ dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6.dtsi +@@ -16,7 +16,7 @@ + }; + + chosen { +- stdout-path = "serial2:1500000n8"; ++ stdout-path = "serial2:115200n8"; + }; + + adc-keys { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6s_dts b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6s_dts deleted file mode 100644 index 5f981d219c3..00000000000 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-nanopi-r6s_dts +++ /dev/null @@ -1,12 +0,0 @@ -Index: dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6s.dts ---- dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6s.dts.orig -+++ dts/upstream/src/arm64/rockchip/rk3588s-nanopi-r6s.dts -@@ -18,7 +18,7 @@ - }; - - chosen { -- stdout-path = "serial2:1500000n8"; -+ stdout-path = "serial2:115200n8"; - }; - - adc-keys { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-orangepi-5_dts b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-orangepi-5_dts deleted file mode 100644 index f6718342d6a..00000000000 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-orangepi-5_dts +++ /dev/null @@ -1,12 +0,0 @@ -Index: dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts ---- dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts.orig -+++ dts/upstream/src/arm64/rockchip/rk3588s-orangepi-5.dts -@@ -19,7 +19,7 @@ - }; - - chosen { -- stdout-path = "serial2:1500000n8"; -+ stdout-path = "serial2:115200n8"; - }; - - adc-keys { diff --git a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-rock-5a_dts b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-rock-5a_dts index 9c7029fa392..c8638a256fe 100644 --- a/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-rock-5a_dts +++ b/sysutils/u-boot/rk3588/patches/patch-dts_upstream_src_arm64_rockchip_rk3588s-rock-5a_dts @@ -1,7 +1,7 @@ Index: dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts --- dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts.orig +++ dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ }; chosen { @@ -9,4 +9,4 @@ Index: dts/upstream/src/arm64/rockchip/rk3588s-rock-5a.dts + stdout-path = "serial2:115200n8"; }; - leds { + hdmi0-con { diff --git a/sysutils/u-boot/rk3588/patches/patch-tools_rkcommon_c b/sysutils/u-boot/rk3588/patches/patch-tools_rkcommon_c index ff31ff3d80b..9f2683ea3fb 100644 --- a/sysutils/u-boot/rk3588/patches/patch-tools_rkcommon_c +++ b/sysutils/u-boot/rk3588/patches/patch-tools_rkcommon_c @@ -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;