[PATCH 1/1] Makefile: pass KEYDIR when set to sunxi-spl.bin mkimage

[Andre Przywara]

On Thu, 10 Apr 2025 19:10:25 -0600
James Hilliard <james.hilliard1 at gmail.com> wrote:

Hi,

> Currently we pass this for u-boot-spl.kwb targets, however when
> building sunxi-spl.bin in the TOC0 format we may also need to
> specify a KEYDIR, as such we should also pass this when set
> to mkimage for the sunxi-spl.bin target.

thanks, looks good to me, tried on a Remix Mini build. Maybe that even
helps with the secure boot CI build problem we have, as the CI cannot
find any keys.

> Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>

Reviewed-by: Andre Przywara <andre.przywara at arm.com>

Queued for the PR.

Cheers,
Andre

> ---
>  scripts/Makefile.xpl | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl
> index abc49fbe6c9..d1c1cea876a 100644
> --- a/scripts/Makefile.xpl
> +++ b/scripts/Makefile.xpl
> @@ -445,7 +445,8 @@ MKIMAGEFLAGS_sunxi-spl.bin = \
>  	-A $(ARCH) \
>  	-T $(CONFIG_SPL_IMAGE_TYPE) \
>  	-a $(CONFIG_SPL_TEXT_BASE) \
> -	-n $(CONFIG_DEFAULT_DEVICE_TREE)
> +	-n $(CONFIG_DEFAULT_DEVICE_TREE) \
> +	$(if $(KEYDIR),-k $(KEYDIR))
>  
>  OBJCOPYFLAGS_u-boot-spl-dtb.hex := -I binary -O ihex --change-address=$(CONFIG_SPL_TEXT_BASE)
>