Bug#979482: u-boot: Pass BL31 to puma-rk3399

2021-01-07 Thread Vagrant Cascadian
On 2021-01-07, Nicolas Boulenguez wrote:
> The option was missing in debian/targets, so the build system is
> seeing BL31=...rk3328 set in the environment by previous platform.
> This is probably not deliberate.

> In order to prevent such issues, it may make sense to unset the
> variable after each use.

Indeed, nice catch!


> From 1424680924e85a02cfac20cd40ace45f9a1d1eff Mon Sep 17 00:00:00 2001
> From: Nicolas Boulenguez 
> Date: Wed, 6 Jan 2021 23:01:16 +0100
> Subject: [PATCH 03/11] Pass BL31 to puma-rk3399
>
> The option was missing in debian/targets, so the build system is
> seeing BL31=...rk3328 set in the environment by previous platform.
> This is probably not deliberate.
...
>  # Vagrant Cascadian 
> -arm64  rockchippuma-rk3399  u-boot.img u-boot.bin u-boot-nodtb.bin 
> spl/u-boot-spl.bin arch/arm/dts/rk3399-puma-haikou.dtb idbloader.img
> +arm64  rockchippuma-rk3399 
> /usr/lib/arm-trusted-firmware/rk3399/bl31.elf u-boot.img u-boot.bin 
> u-boot-nodtb.bin spl/u-boot-spl.bin arch/arm/dts/rk3399-puma-haikou.dtb 
> idbloader.img

At least in the past, this platform required a non-mainline u-boot at
different offsets, which was not packaged in Debian. In this case, it
may have just not made use of the BL31 variable...

I do recall there maybe were some changes relevent to this in recent
u-boot versions that I need to look into. This is a good reminder to do
that, thanks!


live well,
  vagrant


signature.asc
Description: PGP signature


Bug#979482: u-boot: Pass BL31 to puma-rk3399

2021-01-07 Thread Nicolas Boulenguez
Source: u-boot
Severity: minor
Tags: patch

The option was missing in debian/targets, so the build system is
seeing BL31=...rk3328 set in the environment by previous platform.
This is probably not deliberate.

In order to prevent such issues, it may make sense to unset the
variable after each use.
>From 1424680924e85a02cfac20cd40ace45f9a1d1eff Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez 
Date: Wed, 6 Jan 2021 23:01:16 +0100
Subject: [PATCH 03/11] Pass BL31 to puma-rk3399

The option was missing in debian/targets, so the build system is
seeing BL31=...rk3328 set in the environment by previous platform.
This is probably not deliberate.
---
 debian/targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/targets b/debian/targets
index 84850b20f5..7fa7c8b8cc 100644
--- a/debian/targets
+++ b/debian/targets
@@ -213,7 +213,7 @@ arm64  rockchiprockpro64-rk3399  /usr/lib/arm-trusted-firmware/rk3399/bl
 arm64  rockchiprock64-rk3328  /usr/lib/arm-trusted-firmware/rk3328/bl31.elf u-boot.img u-boot.bin u-boot-nodtb.bin spl/u-boot-spl.bin tpl/u-boot-tpl.bin arch/arm/dts/rk3328-rock64.dtb u-boot.itb idbloader.img
 
 # Vagrant Cascadian 
-arm64  rockchippuma-rk3399  u-boot.img u-boot.bin u-boot-nodtb.bin spl/u-boot-spl.bin arch/arm/dts/rk3399-puma-haikou.dtb idbloader.img
+arm64  rockchippuma-rk3399 /usr/lib/arm-trusted-firmware/rk3399/bl31.elf u-boot.img u-boot.bin u-boot-nodtb.bin spl/u-boot-spl.bin arch/arm/dts/rk3399-puma-haikou.dtb idbloader.img
 
 # Walter Lozano 
 arm64  rockchiprock-pi-4-rk3399 /usr/lib/arm-trusted-firmware/rk3399/bl31.elf u-boot.img u-boot.bin u-boot-nodtb.bin spl/u-boot-spl.bin arch/arm/dts/rk3399-rock-pi-4a.dtb arch/arm/dts/rk3399-rock-pi-4b.dtb u-boot.itb idbloader.img
-- 
2.20.1