[PR PATCH] rockpro64-uboot: update to 2025.01.

[PR PATCH] rockpro64-uboot: update to 2025.01.

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]

There is a new pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages rockpro64-uboot-2025.01
https://github.com/void-linux/void-packages/pull/53925

rockpro64-uboot: update to 2025.01.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I tested the U-Boot install methods that I documented in the README.voidlinux file.
- Writing U-Boot to eMMC using the `/usr/lib/rockpro64-uboot/u-boot-rockchip.bin` image and booting from eMMC.
- Writing U-Boot to SPI using the `/usr/lib/rockpro64-uboot/u-boot-rockchip-spi.bin` image and booting from USB.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53925.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rockpro64-uboot-2025.01-53925.patch --]
[-- Type: text/x-diff, Size: 2621 bytes --]

From bc2ceb2ec0219e2ca8e08974e6e1053524654121 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 8 Jan 2025 17:32:35 -0600
Subject: [PATCH] rockpro64-uboot: update to 2025.01.

---
 srcpkgs/rockpro64-uboot/files/README.voidlinux | 17 +++++++++++++++++
 srcpkgs/rockpro64-uboot/template               |  6 ++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100755 srcpkgs/rockpro64-uboot/files/README.voidlinux

diff --git a/srcpkgs/rockpro64-uboot/files/README.voidlinux b/srcpkgs/rockpro64-uboot/files/README.voidlinux
new file mode 100755
index 00000000000000..df252f4c3eec16
--- /dev/null
+++ b/srcpkgs/rockpro64-uboot/files/README.voidlinux
@@ -0,0 +1,17 @@
+There are different options for where to install U-Boot on the RockPro64.
+Below are commands that can be used to write U-Boot to various locations.
+
+# Write U-Boot to SD Card or eMMC
+
+# SD Card
+export target_dev=/dev/mmcblk1
+# eMMC
+export target_dev=/dev/mmcblk2
+dd if=/usr/lib/rockpro64-uboot/u-boot-rockchip.bin of=${target_dev} seek=64
+
+
+# Write U-Boot to SPI
+dd if=/usr/lib/rockpro64-uboot/u-boot-rockchip-spi.bin of=/dev/mtd0
+
+For more information see the U-Boot documentation:
+https://github.com/u-boot/u-boot/blob/v2025.01/doc/board/rockchip/rockchip.rst
diff --git a/srcpkgs/rockpro64-uboot/template b/srcpkgs/rockpro64-uboot/template
index 7ee2af77590733..b2023da47d4776 100644
--- a/srcpkgs/rockpro64-uboot/template
+++ b/srcpkgs/rockpro64-uboot/template
@@ -1,6 +1,6 @@
 # Template file for 'rockpro64-uboot'
 pkgname=rockpro64-uboot
-version=2024.07
+version=2025.01
 revision=1
 archs="aarch64*"
 hostmakedepends="bison flex bc dtc which python3 swig python3-devel python3-setuptools python3-pyelftools openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
@@ -11,7 +11,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+checksum=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 
 do_configure() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
@@ -31,6 +31,8 @@ do_build() {
 do_install() {
 	vinstall idbloader.img 0644 usr/lib/rockpro64-uboot
 	vinstall u-boot.itb 0644 usr/lib/rockpro64-uboot
+	vinstall u-boot-rockchip-spi.bin 0644 usr/lib/rockpro64-uboot
+	vinstall u-boot-rockchip.bin 0644 usr/lib/rockpro64-uboot
 	vlicense Licenses/Exceptions
 	vlicense Licenses/README
 	vlicense Licenses/bsd-2-clause.txt

Re: rockpro64-uboot: update to 2025.01.

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/53925#issuecomment-2585003347

Comment:
@Anachron I think you'll be interested in this PR.  Sorry it took me so long to get back to you about booting from USB.  I tried some things without luck and just this week found a method that works.

I updated u-boot to 2025.1 and found simpler ways to write u-boot to the board.  I tested booting from USB (with no other storage attached) after using `dd if=/usr/lib/rockpro64-uboot/u-boot-rockchip-spi.bin of=/dev/mtd0` to write u-boot to SPI.

Re: [PR PATCH] [Updated] rockpro64-uboot: update to 2025.01.

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages rockpro64-uboot-2025.01
https://github.com/void-linux/void-packages/pull/53925

rockpro64-uboot: update to 2025.01.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

I tested the U-Boot install methods that I documented in the README.voidlinux file.
- Writing U-Boot to eMMC using the `/usr/lib/rockpro64-uboot/u-boot-rockchip.bin` image and booting from eMMC.
- Writing U-Boot to SPI using the `/usr/lib/rockpro64-uboot/u-boot-rockchip-spi.bin` image and booting from USB.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/53925.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rockpro64-uboot-2025.01-53925.patch --]
[-- Type: text/x-diff, Size: 2660 bytes --]

From 6885e11c4ef5ae2459959890ae261b3462bf5e02 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Wed, 8 Jan 2025 17:32:35 -0600
Subject: [PATCH] rockpro64-uboot: update to 2025.01.

---
 srcpkgs/rockpro64-uboot/files/README.voidlinux | 17 +++++++++++++++++
 srcpkgs/rockpro64-uboot/template               |  7 +++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100755 srcpkgs/rockpro64-uboot/files/README.voidlinux

diff --git a/srcpkgs/rockpro64-uboot/files/README.voidlinux b/srcpkgs/rockpro64-uboot/files/README.voidlinux
new file mode 100755
index 00000000000000..df252f4c3eec16
--- /dev/null
+++ b/srcpkgs/rockpro64-uboot/files/README.voidlinux
@@ -0,0 +1,17 @@
+There are different options for where to install U-Boot on the RockPro64.
+Below are commands that can be used to write U-Boot to various locations.
+
+# Write U-Boot to SD Card or eMMC
+
+# SD Card
+export target_dev=/dev/mmcblk1
+# eMMC
+export target_dev=/dev/mmcblk2
+dd if=/usr/lib/rockpro64-uboot/u-boot-rockchip.bin of=${target_dev} seek=64
+
+
+# Write U-Boot to SPI
+dd if=/usr/lib/rockpro64-uboot/u-boot-rockchip-spi.bin of=/dev/mtd0
+
+For more information see the U-Boot documentation:
+https://github.com/u-boot/u-boot/blob/v2025.01/doc/board/rockchip/rockchip.rst
diff --git a/srcpkgs/rockpro64-uboot/template b/srcpkgs/rockpro64-uboot/template
index 7ee2af77590733..2ce7891ad0d283 100644
--- a/srcpkgs/rockpro64-uboot/template
+++ b/srcpkgs/rockpro64-uboot/template
@@ -1,6 +1,6 @@
 # Template file for 'rockpro64-uboot'
 pkgname=rockpro64-uboot
-version=2024.07
+version=2025.01
 revision=1
 archs="aarch64*"
 hostmakedepends="bison flex bc dtc which python3 swig python3-devel python3-setuptools python3-pyelftools openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
@@ -11,7 +11,7 @@ maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://www.denx.de/wiki/U-Boot/"
 distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
-checksum=f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+checksum=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
 
 do_configure() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
@@ -31,6 +31,9 @@ do_build() {
 do_install() {
 	vinstall idbloader.img 0644 usr/lib/rockpro64-uboot
 	vinstall u-boot.itb 0644 usr/lib/rockpro64-uboot
+	vinstall u-boot-rockchip-spi.bin 0644 usr/lib/rockpro64-uboot
+	vinstall u-boot-rockchip.bin 0644 usr/lib/rockpro64-uboot
+	vdoc "${FILESDIR}/README.voidlinux"
 	vlicense Licenses/Exceptions
 	vlicense Licenses/README
 	vlicense Licenses/bsd-2-clause.txt

Re: rockpro64-uboot: update to 2025.01.

[Anachron]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/53925#issuecomment-2585221957

Comment:
Hey @tsndqst thanks for the PR, I did flash a New uboot to PSI but still had no success.

I will get another miniPC soon, so I will maybe be able to dig into it once I migrated my stuff from the rockpro64 away.

Re: rockpro64-uboot: update to 2025.01.

[tsndqst]

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/53925#issuecomment-2585270041

Comment:
> Hey @tsndqst thanks for the PR, I did flash a New uboot to PSI but still had no success.

Sorry to hear that.  Were you able to see any output on the serial console?