[bug#37741] [PATCH 0/3] Update u-boot to 2019.10 and add u-boot-rockpro64-rk3399.

[bug#37741] [PATCH 0/3] Update u-boot to 2019.10 and add u-boot-rockpro64-rk3399.

[nomble]

From: Caliph Nomble <nomble@palism.com>

Blobless LPDDR4 training for the rk3399 was just added in u-boot 2019.10,
necessitating the update. Patches combined into a single set for that reason.
U-boot patch removed due to mainlining.

Caliph Nomble (3):
  gnu: u-boot: Update to 2019.10.
  gnu: Add arm-trusted-firmware-rk3399.
  gnu: Add u-boot-rockpro64-rk3399

 gnu/bootloader/u-boot.scm                     | 17 ++++++
 gnu/local.mk                                  |  1 -
 gnu/packages/bootloaders.scm                  | 27 +++++++--
 gnu/packages/firmware.scm                     | 23 ++++++++
 ...boot-fix-mkimage-header-verification.patch | 57 -------------------
 gnu/system/install.scm                        |  6 ++
 6 files changed, 68 insertions(+), 63 deletions(-)
 delete mode 100644 gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch

-- 
2.21.0

[bug#37741] [PATCH 1/3] gnu: u-boot: Update to 2019.10.

[nomble]

From: Caliph Nomble <nomble@palism.com>

* gnu/packages/bootloaders.scm (u-boot): Update to 2019.10.
[source]: Remove upstreamed patches.
* gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch: Delete
file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Caliph Nomble <nomble@palism.com>
---
 gnu/local.mk                                  |  1 -
 gnu/packages/bootloaders.scm                  |  7 +--
 ...boot-fix-mkimage-header-verification.patch | 57 -------------------
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 39b8e009b2..428708c9fe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1371,7 +1371,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/totem-meson-easy-codec.patch		\
   %D%/packages/patches/tuxpaint-stamps-path.patch		\
   %D%/packages/patches/txr-shell.patch				\
-  %D%/packages/patches/u-boot-fix-mkimage-header-verification.patch	\
   %D%/packages/patches/unzip-CVE-2014-8139.patch		\
   %D%/packages/patches/unzip-CVE-2014-8140.patch		\
   %D%/packages/patches/unzip-CVE-2014-8141.patch		\
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 520728b52c..91f27d2e38 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -400,7 +400,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
 (define u-boot
   (package
     (name "u-boot")
-    (version "2019.04")
+    (version "2019.10")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -408,10 +408,7 @@ tree binary files.  These are board description files used by Linux and BSD.")
                     "u-boot-" version ".tar.bz2"))
               (sha256
                (base32
-                "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn"))
-              (patches
-               (search-patches
-                "u-boot-fix-mkimage-header-verification.patch"))))
+                "053hcrwwlacqh2niisn0zas95zkbffw5aw5sdhixs8lmfdq60vcd"))))
     (native-inputs
      `(("bc" ,bc)
        ("bison" ,bison)
diff --git a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch b/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch
deleted file mode 100644
index 063677db4a..0000000000
--- a/gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 48b52117235928cfd7ef1ec5c3f2cff5d7b03862 Mon Sep 17 00:00:00 2001
-From: Jordan Hand <jordanhand22@gmail.com>
-Date: Wed, 10 Apr 2019 09:46:32 -0700
-Subject: [PATCH,v2] fdt: Fix mkimage list to try every header type
-Origin: https://patchwork.ozlabs.org/patch/1083495/
-
-Image type is not supplied to `mkimage -l`. For this reason, we cannot
-use imagetool_verify_print_header_by_type. Instead, this patch uses
-imagetool_verify_print_header to look through all header types to find
-one where image validation succeeds.
-
-This patch fixes failures in test/image/test-imagetools.sh
-
-Signed-off-by: Jordan Hand <jorhand@microsoft.com>
-Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
-Tested-by: Vagrant Cascadian <vagrant@debian.org>
----
- tools/mkimage.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/tools/mkimage.c b/tools/mkimage.c
-index 2899adff81..76c3406d37 100644
---- a/tools/mkimage.c
-+++ b/tools/mkimage.c
-@@ -403,14 +403,21 @@ int main(int argc, char **argv)
- 			exit (EXIT_FAILURE);
- 		}
- 
--		/*
--		 * scan through mkimage registry for all supported image types
--		 * and verify the input image file header for match
--		 * Print the image information for matched image type
--		 * Returns the error code if not matched
--		 */
--		retval = imagetool_verify_print_header_by_type(ptr, &sbuf,
--				tparams, &params);
-+		if (params.fflag) {
-+			/*
-+			 * Verifies the header format based on the expected header for
-+			 * image type in tparams
-+			 */
-+			retval = imagetool_verify_print_header_by_type(ptr, &sbuf,
-+					tparams, &params);
-+		} else {
-+			/**
-+			 * When listing the image, we are not given the image type. Simply check all
-+			 * image types to find one that matches our header
-+			 */
-+			retval = imagetool_verify_print_header(ptr, &sbuf,
-+					tparams, &params);
-+		}
- 
- 		(void) munmap((void *)ptr, sbuf.st_size);
- 		(void) close (ifd);
--- 
-2.20.1
-
-- 
2.21.0

[bug#37741] [PATCH 1/3] gnu: u-boot: Update to 2019.10.

[Vagrant Cascadian]

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

On 2019-10-14, nomble@palism.com wrote:
> From: Caliph Nomble <nomble@palism.com>
>
> * gnu/packages/bootloaders.scm (u-boot): Update to 2019.10.
> [source]: Remove upstreamed patches.
> * gnu/packages/patches/u-boot-fix-mkimage-header-verification.patch: Delete
> file.
> * gnu/local.mk (dist_patch_DATA): Remove it.

Thanks for working on this!

I've been holding back on updating u-boot in Guix, as there are several
unresolved bugs on other platforms, and the u-boot-tools package fails
tests, last I tried.

Might make sense to make versioned u-boot-2019.04 and u-boot-2019.10
packages (kind of like the linux-libre packages, possibly?), so that
platforms that still need to use the older version don't hold back
platforms that need or would benefit from the newer version?


live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[nomble]

From: Caliph Nomble <nomble@palism.com>

* gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
variable.

Signed-off-by: Caliph Nomble <nomble@palism.com>
---
 gnu/packages/firmware.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index c473ccd920..636b1f4746 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -476,6 +476,29 @@ such as:
            (base32
             "0vqhwqqh8h9qlkpybg2v94911091c1418bc4pnzq5fd7zf0fjkf8")))))))
 
+(define-public arm-trusted-firmware-rk3399
+  (let ((base (make-arm-trusted-firmware "rk3399")))
+    (package
+      (inherit base)
+      (name "arm-trusted-firmware-rk3399")
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           `(modify-phases ,phases
+              (add-after 'install 'install-elf
+                (lambda* (#:key outputs #:allow-other-keys)
+                  (let ((out (assoc-ref outputs "out"))
+                        (elf (find-files "." ".*\\.elf$")))
+                    (for-each
+                      (lambda (file)
+                        (install-file file out))
+                      elf))
+                  #t))))))
+      (native-inputs
+       `(("cross32-gcc" ,(cross-gcc "arm-none-eabi"))
+         ("cross32-binutils", (cross-binutils "arm-none-eabi"))
+         ,@(package-native-inputs base))))))
+
 (define-public rk3399-cortex-m0
   (package
     (name "rk3399-cortex-m0")
-- 
2.21.0

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[Vagrant Cascadian]

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

On 2019-10-14, nomble@palism.com wrote:
> * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
> variable.

Thanks for working on this!

Unfortunately this currently embeds a binary blob
(plat/rockchip/rk3399/drivers/dp/hdcp.bin) with no license.

I reported the issue upstream:

  https://github.com/ARM-software/tf-issues/issues/651

The proposed solution would be to enable a build flag to disables the
DRM feature that hdcp.bin is used for video streaming.

I've talked with Kever Yang from Rockchip about getting the ability to
disable the requirement for hdcp.bin upstream; I'm sure they'd welcome
patches too!

This would be good for both Debian and GNU Guix. There are several
rk3399 platforms depending on it.

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[Kever Yang]

Hi Vagrant,

On 2019/10/15 下午12:02, Vagrant Cascadian wrote:
> On 2019-10-14, nomble@palism.com wrote:
>> * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
>> variable.
> Thanks for working on this!
>
> Unfortunately this currently embeds a binary blob
> (plat/rockchip/rk3399/drivers/dp/hdcp.bin) with no license.
>
> I reported the issue upstream:
>
>    https://github.com/ARM-software/tf-issues/issues/651


I have send the patch to ATF to remove the hdpc.bin, you can comment on it.

https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/2194


Thanks,

- Kever

>
> The proposed solution would be to enable a build flag to disables the
> DRM feature that hdcp.bin is used for video streaming.
>
> I've talked with Kever Yang from Rockchip about getting the ability to
> disable the requirement for hdcp.bin upstream; I'm sure they'd welcome
> patches too!
>
> This would be good for both Debian and GNU Guix. There are several
> rk3399 platforms depending on it.
>
> live well,
>    vagrant

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[Vagrant Cascadian]

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

On 2019-10-15, Kever Yang wrote:
> On 2019/10/15 下午12:02, Vagrant Cascadian wrote:
>> On 2019-10-14, nomble@palism.com wrote:
>>> * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
>>> variable.
>> Thanks for working on this!
>>
>> Unfortunately this currently embeds a binary blob
>> (plat/rockchip/rk3399/drivers/dp/hdcp.bin) with no license.
>>
>> I reported the issue upstream:
>>
>>    https://github.com/ARM-software/tf-issues/issues/651
>
>
> I have send the patch to ATF to remove the hdpc.bin, you can comment on it.
>
> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/2194

On both Debian and Guix it fails to build with:

plat/rockchip/rk3399/plat_sip_calls.c: In function
‘rockchip_plat_sip_handler’:
plat/rockchip/rk3399/plat_sip_calls.c:59:15: error: unused variable ‘x6’
[-Werror=unused-variable]
  uint64_t x5, x6;
               ^~
plat/rockchip/rk3399/plat_sip_calls.c:59:11: error: unused variable ‘x5’
[-Werror=unused-variable]
  uint64_t x5, x6;
           ^~
cc1: all warnings being treated as errors
make: *** [Makefile:777: build/rk3399/debug/bl31/plat_sip_calls.o] Error
1
make: *** Waiting for unfinished jobs....
command "make" "-j" "3" "PLAT=rk3399" "CROSS_COMPILE=aarch64-linux-gnu-"
"DEBUG=1" failed with status 2


Also commented on the patch in review.trustedfirmware.org.


live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[Kever Yang]

Vagrant,

On 2019/10/17 下午1:46, Vagrant Cascadian wrote:
> On 2019-10-15, Kever Yang wrote:
>> On 2019/10/15 下午12:02, Vagrant Cascadian wrote:
>>> On 2019-10-14, nomble@palism.com wrote:
>>>> * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
>>>> variable.
>>> Thanks for working on this!
>>>
>>> Unfortunately this currently embeds a binary blob
>>> (plat/rockchip/rk3399/drivers/dp/hdcp.bin) with no license.
>>>
>>> I reported the issue upstream:
>>>
>>>     https://github.com/ARM-software/tf-issues/issues/651
>>
>> I have send the patch to ATF to remove the hdpc.bin, you can comment on it.
>>
>> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/2194
> On both Debian and Guix it fails to build with:
>
> plat/rockchip/rk3399/plat_sip_calls.c: In function
> ‘rockchip_plat_sip_handler’:
> plat/rockchip/rk3399/plat_sip_calls.c:59:15: error: unused variable ‘x6’
> [-Werror=unused-variable]
>    uint64_t x5, x6;
>                 ^~
> plat/rockchip/rk3399/plat_sip_calls.c:59:11: error: unused variable ‘x5’
> [-Werror=unused-variable]
>    uint64_t x5, x6;
>             ^~
> cc1: all warnings being treated as errors
> make: *** [Makefile:777: build/rk3399/debug/bl31/plat_sip_calls.o] Error
> 1
> make: *** Waiting for unfinished jobs....
> command "make" "-j" "3" "PLAT=rk3399" "CROSS_COMPILE=aarch64-linux-gnu-"
> "DEBUG=1" failed with status 2
>
>
> Also commented on the patch in review.trustedfirmware.org.


Sorry, I do catch this issue last week, but forgot to update it to the 
Gerrit.

Already update to a new patch set now.


Thanks,

- Kever

>
>
> live well,
>    vagrant

[bug#37741] [PATCH 2/3] gnu: Add arm-trusted-firmware-rk3399.

[Vagrant Cascadian]

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

On 2019-10-17, Kever Yang wrote:
> On 2019/10/17 下午1:46, Vagrant Cascadian wrote:
>> On 2019-10-15, Kever Yang wrote:
>>> On 2019/10/15 下午12:02, Vagrant Cascadian wrote:
>>>> On 2019-10-14, nomble@palism.com wrote:
>>>>> * gnu/packages/bootloaders.scm (arm-trusted-firmware-rk3399): New exported
>>>>> variable.
>>>> Thanks for working on this!
>>>>
>>>> Unfortunately this currently embeds a binary blob
>>>> (plat/rockchip/rk3399/drivers/dp/hdcp.bin) with no license.
>>>>
>>>> I reported the issue upstream:
>>>>
>>>>     https://github.com/ARM-software/tf-issues/issues/651
>>>
>>> I have send the patch to ATF to remove the hdpc.bin, you can comment on it.
>>>
>>> https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/2194
>> On both Debian and Guix it fails to build with:
>>
>> plat/rockchip/rk3399/plat_sip_calls.c: In function
>> ‘rockchip_plat_sip_handler’:
>> plat/rockchip/rk3399/plat_sip_calls.c:59:15: error: unused variable ‘x6’
>> [-Werror=unused-variable]
>>    uint64_t x5, x6;
...
> Sorry, I do catch this issue last week, but forgot to update it to the 
> Gerrit.
>
> Already update to a new patch set now.

Thanks! Was able to test on a rockpro64-rk3399 board, and it worked with
u-boot.

Pushed a slightly modified patch adding arm-trusted-firmware-rk3399 to
guix/master in commit 074554a2891830900e2ff9335799416723094fcb.

Will work on pushing the rest of the series as well; I've made some
relatively minor changes locally...


live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#37741] [PATCH 3/3] gnu: Add u-boot-rockpro64-rk3399

[nomble]

From: Caliph Nomble <nomble@palism.com>

* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399): New exported
variable.
* gnu/bootloader/u-boot.scm (u-boot-rockpro64-rk3399-bootloader): New exported
variable.
(install-rockpro64-rk3399-u-boot): New variable.
* gnu/system/install.scm (rockpro64-installation-os): New exported variable.

Signed-off-by: Caliph Nomble <nomble@palism.com>
---
 gnu/bootloader/u-boot.scm    | 17 +++++++++++++++++
 gnu/packages/bootloaders.scm | 20 ++++++++++++++++++++
 gnu/system/install.scm       |  6 ++++++
 3 files changed, 43 insertions(+)

diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 54abfe1c69..4f98be2483 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -34,6 +34,7 @@
             u-boot-pine64-plus-bootloader
             u-boot-pinebook-bootloader
             u-boot-puma-rk3399-bootloader
+            u-boot-rockpro64-rk3399-bootloader
             u-boot-wandboard-bootloader))
 
 (define install-u-boot
@@ -90,6 +91,15 @@
         (write-file-on-device u-boot (stat:size (stat u-boot))
                               device (* 512 512)))))
 
+(define install-rockpro64-rk3399-u-boot
+  #~(lambda (bootloader device mount-point)
+      (let ((idb (string-append bootloader "/libexec/idbloader.img"))
+            (u-boot (string-append bootloader "/libexec/u-boot.itb")))
+        (write-file-on-device idb (stat:size (stat idb))
+                              device (* 64 512))
+        (write-file-on-device u-boot (stat:size (stat u-boot))
+                              device (* 16384 512)))))
+
 \f
 
 ;;;
@@ -179,3 +189,10 @@
    (inherit u-boot-bootloader)
    (package u-boot-puma-rk3399)
    (installer install-puma-rk3399-u-boot)))
+
+(define u-boot-rockpro64-rk3399-bootloader
+  ;; SD and eMMC use the same format
+  (bootloader
+   (inherit u-boot-bootloader)
+   (package u-boot-rockpro64-rk3399)
+   (installer install-rockpro64-rk3399-u-boot)))
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 91f27d2e38..16cb72b46c 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -743,6 +743,26 @@ to Novena upstream, does not load u-boot.img from the first partition.")
          ("firmware-m0" ,rk3399-cortex-m0)
          ,@(package-native-inputs base))))))
 
+(define-public u-boot-rockpro64-rk3399
+  (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu")))
+    (package
+      (inherit base)
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases)
+           `(modify-phases ,phases
+              (add-after 'unpack 'set-environment
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (setenv "BL31" (string-append (assoc-ref inputs "firmware")
+                                                "/bl31.elf"))
+                  #t))
+              ;; Phases do not succeed on the bl31 ELF.
+              (delete 'strip)
+              (delete 'validate-runpath)))))
+      (native-inputs
+       `(("firmware" ,arm-trusted-firmware-rk3399)
+         ,@(package-native-inputs base))))))
+
 (define-public vboot-utils
   (package
     (name "vboot-utils")
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 912096027f..eab3649269 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -62,6 +62,7 @@
             novena-installation-os
             pine64-plus-installation-os
             pinebook-installation-os
+            rockpro64-installation-os
             rk3399-puma-installation-os
             wandboard-installation-os
             os-with-u-boot))
@@ -583,6 +584,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET."
                             "/dev/mmcblk0" ; SD card storage
                             "ttyS0"))
 
+(define rockpro64-installation-os
+  (embedded-installation-os u-boot-rockpro64-rk3399-bootloader
+                            "/dev/mmcblk0" ; SD card/eMMC (SD priority) storage
+                            "ttyS2")) ; UART2 connected on the Pi2 bus
+
 (define rk3399-puma-installation-os
   (embedded-installation-os u-boot-puma-rk3399-bootloader
                             "/dev/mmcblk0" ; SD card storage
-- 
2.21.0

bug#37741: [PATCH 0/3] Update u-boot to 2019.10 and add u-boot-rockpro64-rk3399.

[Vagrant Cascadian]

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

On 2019-10-13, nomble@palism.com wrote:
> Blobless LPDDR4 training for the rk3399 was just added in u-boot 2019.10,
> necessitating the update. Patches combined into a single set for that reason.
> U-boot patch removed due to mainlining.
>
> Caliph Nomble (3):
>   gnu: u-boot: Update to 2019.10.

Didn't quite merge this, but added a u-boot-2019.10 variant in:

074554a2891830900e2ff9335799416723094fcb

>   gnu: Add arm-trusted-firmware-rk3399.

Modified patch pushed to guix/master:

074554a2891830900e2ff9335799416723094fcb

>   gnu: Add u-boot-rockpro64-rk3399

Modified patch pushed to guix/master:

fa7470189eed39ae863f8f269fd3ef29bb084f16

Thanks for the patches! It happened to be really good timing for me; I
literally had a rockpro64-rk3399 already ordered and it arrived just
yesterday so I even tested it!

It would be *nice* to fix all the bugs in the many u-boot-* targets in
newer u-boot versions, but for the moment I'm just doing what's needed
to add this target (and while I was at it, rock64-rk3328).

Marking this bug as done.


live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]