Re: [PR PATCH] [Updated] Rock64 U-Boot Image

[CameronNemo <CameronNemo@users.noreply.github.com>]

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

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

https://github.com/CameronNemo/void-packages rock64-uboot
https://github.com/void-linux/void-packages/pull/21198

Rock64 U-Boot Image
This image uses the latest upstream sources and no binary blobs.
I have tested the boot on my device.

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

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

From 1ade6fe406aee315e1a1a9f9bbd7b428c07503f7 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 19 Apr 2020 21:24:28 -0700
Subject: [PATCH 1/2] New Package: atf-rk3328-bl31-2.3.

---
 srcpkgs/atf-rk3328-bl31/template | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/atf-rk3328-bl31/template

diff --git a/srcpkgs/atf-rk3328-bl31/template b/srcpkgs/atf-rk3328-bl31/template
new file mode 100644
index 00000000000..762ebdc0d9f
--- /dev/null
+++ b/srcpkgs/atf-rk3328-bl31/template
@@ -0,0 +1,27 @@
+# Template file for 'atf-rk3328-bl31'
+pkgname=atf-rk3328-bl31
+version=2.3
+revision=1
+archs="aarch64*"
+wrksrc="trusted-firmware-a-${version}"
+build_style=gnu-makefile
+short_desc="ARM Trusted Firmware for Rockchip rk3328 boards (ARMv8, bl31 option)"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="BSD-3-Clause"
+homepage="https://developer.trustedfirmware.org/dashboard/view/6/"
+distfiles="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${version}.tar.gz"
+checksum=37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21
+nostrip=yes
+
+do_build() {
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	if [ "$CROSS_BUILD" ]; then
+		export CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
+	fi
+	make ${makejobs} PLAT=rk3328 bl31
+}
+
+do_install() {
+	vinstall build/rk3328/release/bl31/bl31.elf 0755 usr/lib/trusted-firmware-a/rk3328
+	vlicense docs/license.rst
+}

From 7e8b097f132460b0465cd755305f7c236286b163 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 19 Apr 2020 21:25:09 -0700
Subject: [PATCH 2/2] New Package: rock64-uboot-2020.07.

[ci skip] travis may or may not like the ftp distfiles
---
 srcpkgs/rock64-uboot/template | 46 +++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/rock64-uboot/template

diff --git a/srcpkgs/rock64-uboot/template b/srcpkgs/rock64-uboot/template
new file mode 100644
index 00000000000..b373d5b3992
--- /dev/null
+++ b/srcpkgs/rock64-uboot/template
@@ -0,0 +1,46 @@
+# Template file for 'rock64-uboot'
+pkgname=rock64-uboot
+version=2020.07
+revision=1
+archs="aarch64*"
+wrksrc="u-boot-${version}"
+build_style=gnu-makefile
+hostmakedepends="flex bc python3 swig python3-devel dtc"
+makedepends="atf-rk3328-bl31"
+short_desc="Das U-Boot for the Rock64 SBC"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="GPL-2.0-or-later, BSD-3-Clause"
+homepage="https://www.denx.de/wiki/U-Boot/"
+distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
+checksum=c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a
+
+do_configure() {
+	make rock64-rk3328_defconfig
+}
+
+do_build() {
+	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	if [ "$CROSS_BUILD" ]; then
+		export CROSS_COMPILE="${XBPS_CROSS_TRIPLET}-"
+	fi
+	make ${makejobs} EXTRAVERSION="-${revision}" \
+		BL31="${XBPS_CROSS_BASE}/usr/lib/trusted-firmware-a/rk3328/bl31.elf"
+}
+
+do_install() {
+	vinstall idbloader.img 0644 usr/lib/rock64-uboot
+	vinstall u-boot.itb 0644 usr/lib/rock64-uboot
+	vlicense Licenses/Exceptions
+	vlicense Licenses/OFL.txt
+	vlicense Licenses/README
+	vlicense Licenses/bsd-2-clause.txt
+	vlicense Licenses/bsd-3-clause.txt
+	vlicense Licenses/eCos-2.0.txt
+	vlicense Licenses/gpl-2.0.txt
+	vlicense Licenses/ibm-pibs.txt
+	vlicense Licenses/isc.txt
+	vlicense Licenses/lgpl-2.0.txt
+	vlicense Licenses/lgpl-2.1.txt
+	vlicense Licenses/r8a779x_usb3.txt
+	vlicense Licenses/x11.txt
+}