Bug#980363: u-boot: Set BL31 SCP on the command line instead of the environment

[Nicolas Boulenguez]

Source: u-boot
Severity: wishlist
Tags: patch

The data flow is more explicit and traced in the logs. Apparently, the
only problem is that this possibility is underdocumented :-)

>From 1690c2d3f7fec6e4b4ec9c860b437b14faa8eb5b Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Sun, 17 Jan 2021 16:38:39 +0100
Subject: Set BL31 SCP on the command line instead of the environment

The data flow is more explicit and traced in the logs. Apparently, the
only problem is that this possibility is underdocumented :-)

diff --git a/debian/rules b/debian/rules
index c170810d2b..d70941bab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,10 +58,10 @@ build-targets: configs/novena-rawsd_defconfig 
configs/am335x_boneblack_defconfig
            | grep $(TARGETSUBARCH) \
            | while read arch subarch platform bl31 targets; do \
                builddir=debian/build/$$platform; \
+               assigns=; \
                case $$bl31 in \
-                       /usr/lib/arm-trusted-firmware/*) export BL31=$$bl31 ;; \
-                       *) targets="$$bl31 $$targets" ;\
-                               unset BL31 ;; \
+                       /usr/lib/arm-trusted-firmware/*) assigns="$$assigns 
BL31=$$bl31" ;; \
+                       *) targets="$$bl31 $$targets" ;; \
                esac; \
                case $$platform in \
                        novena-rawsd) targets="$$targets" ;\
@@ -80,13 +80,12 @@ build-targets: configs/novena-rawsd_defconfig 
configs/am335x_boneblack_defconfig
                        *) CROSS_COMPILE=$(CROSS_COMPILE) ;; \
                esac;\
                case $$subarch in \
-                       sunxi) export SCP=/dev/null ;;\
-                       *) unset SCP ;;\
+                       sunxi) assigns="$$assigns SCP=/dev/null" ;;\
                esac;\
                mkdir -p $$builddir; \
-               dh_auto_build -- V=$(VERBOSE) O=$$builddir 
CROSS_COMPILE=$${CROSS_COMPILE} $${platform}_defconfig; \
+               dh_auto_build -- V=$(VERBOSE) O=$$builddir 
CROSS_COMPILE=$${CROSS_COMPILE} $${platform}_defconfig $$assigns; \
                sed -i -e 's,CONFIG_FIT_SIGNATURE=y,# CONFIG_FIT_SIGNATURE is 
not set,g' $$builddir/.config; \
-               dh_auto_build -- V=$(VERBOSE) O=$$builddir 
CROSS_COMPILE=$${CROSS_COMPILE}; \
+               dh_auto_build -- V=$(VERBOSE) O=$$builddir 
CROSS_COMPILE=$${CROSS_COMPILE} $$assigns; \
                case "$$targets" in \
                        *uboot.elf*) \
                                install -m 644 $$builddir/u-boot 
$$builddir/uboot.elf; \