[bug#61769] [PATCH 0/1] gnu: u-boot-rock64-rk3328: Fix.

[bug#61769] [PATCH 0/1] gnu: u-boot-rock64-rk3328: Fix.

[Simon South]

This patch fixes a typo in the package definition for u-boot-rock64-rk3328,
the default bootloader for ROCK64 computers, that causes the machine to fail
to boot.

Inadvertently setting the wrong environment variable means the firmware
package normally bundled into the bootloader isn't found at build time.  In
fact the build log[0] notes

  WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional

U-Boot complains about the missing firmware at boot and the system freezes
when attempting to start the kernel.

Tested on an actual ROCK64 and the patch appears to work fine.

--
Simon South
simon@simonsouth.net

[0] https://ci.guix.gnu.org/build/350374/log/raw


Simon South (1):
  gnu: u-boot-rock64-rk3328: Fix.

 gnu/packages/bootloaders.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: e615aaca28fd6b797e9b41a71096ebe878c89299
-- 
2.39.1

[bug#61769] [PATCH 1/1] gnu: u-boot-rock64-rk3328: Fix.

[Simon South]

* gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)[arguments]: Fix typo.
---
 gnu/packages/bootloaders.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 9d56efb628..7e839fa859 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1193,7 +1193,7 @@ (define-public u-boot-rock64-rk3328
           #~(modify-phases #$phases
               (add-after 'unpack 'set-environment
                 (lambda* (#:key native-inputs inputs #:allow-other-keys)
-                  (setenv "BL31 "(search-input-file inputs "bl31.elf"))))))))
+                  (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
       (inputs
        (modify-inputs (package-inputs base)
          (append arm-trusted-firmware-rk3328))))))
-- 
2.39.1

bug#61769: [PATCH 0/1] gnu: u-boot-rock64-rk3328: Fix.

[Leo Famulari]

On Fri, Feb 24, 2023 at 03:05:51PM -0500, Simon South wrote:
> This patch fixes a typo in the package definition for u-boot-rock64-rk3328,
> the default bootloader for ROCK64 computers, that causes the machine to fail
> to boot.
> 
> Inadvertently setting the wrong environment variable means the firmware
> package normally bundled into the bootloader isn't found at build time.  In
> fact the build log[0] notes
> 
>   WARNING: BL31 file bl31.elf NOT found, resulting binary is non-functional
> 
> U-Boot complains about the missing firmware at boot and the system freezes
> when attempting to start the kernel.
> 
> Tested on an actual ROCK64 and the patch appears to work fine.

Thanks for the patch and explanation! Pushed as
df8b8f0c76388239dac9f2892c97b92e92c92901