diff mbox series

[v4,5/9] sunxi: binman: Provide a default BL31 filename

Message ID 20200912213545.64376-6-samuel@sholland.org
State Changes Requested
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series sunxi: binman fixes and SCP firmware support | expand

Commit Message

Samuel Holland Sept. 12, 2020, 9:35 p.m. UTC
Prior to commit 7f7f8aca8257 ("sunxi: Convert 64-bit boards to use
binman"), if the BL31 environment variable was not defined, the firmware
would be loaded from a file "bl31.bin" in the current directory. Restore
that behavior by providing that as the default filename in case no entry
arg is provided, which will be the case if the environment variable is
unset.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
 arch/arm/dts/sunxi-u-boot.dtsi | 1 +
 1 file changed, 1 insertion(+)

Comments

Jagan Teki Oct. 21, 2020, 6:49 p.m. UTC | #1
Hi Samuel,

On Sun, Sep 13, 2020 at 3:05 AM Samuel Holland <samuel@sholland.org> wrote:
>
> Prior to commit 7f7f8aca8257 ("sunxi: Convert 64-bit boards to use
> binman"), if the BL31 environment variable was not defined, the firmware
> would be loaded from a file "bl31.bin" in the current directory. Restore
> that behavior by providing that as the default filename in case no entry
> arg is provided, which will be the case if the environment variable is
> unset.
>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
> ---
>  arch/arm/dts/sunxi-u-boot.dtsi | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
> index 82b97a9503f..6ab0c783ba5 100644
> --- a/arch/arm/dts/sunxi-u-boot.dtsi
> +++ b/arch/arm/dts/sunxi-u-boot.dtsi
> @@ -52,6 +52,7 @@
>  #endif
>
>                                         atf-bl31 {
> +                                               filename = "bl31.bin";

 I have dropped missing-msg = "atf-bl31-sunxi"; and used filename
section as above.

Build showing below messages.

  MKIMAGE u-boot.img
  MKIMAGE u-boot-dtb.img
  BINMAN  all
Image 'main-section' is missing external blobs and is non-functional: scp

Some images are invalid

Cannot we make scp as optional for the build?

Jagan.
Samuel Holland Oct. 22, 2020, 1:53 a.m. UTC | #2
On 10/21/20 1:49 PM, Jagan Teki wrote:
> Hi Samuel,
> 
> On Sun, Sep 13, 2020 at 3:05 AM Samuel Holland <samuel@sholland.org> wrote:
>>
>> Prior to commit 7f7f8aca8257 ("sunxi: Convert 64-bit boards to use
>> binman"), if the BL31 environment variable was not defined, the firmware
>> would be loaded from a file "bl31.bin" in the current directory. Restore
>> that behavior by providing that as the default filename in case no entry
>> arg is provided, which will be the case if the environment variable is
>> unset.
>>
>> Reviewed-by: Simon Glass <sjg@chromium.org>
>> Signed-off-by: Samuel Holland <samuel@sholland.org>
>> ---
>>  arch/arm/dts/sunxi-u-boot.dtsi | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
>> index 82b97a9503f..6ab0c783ba5 100644
>> --- a/arch/arm/dts/sunxi-u-boot.dtsi
>> +++ b/arch/arm/dts/sunxi-u-boot.dtsi
>> @@ -52,6 +52,7 @@
>>  #endif
>>
>>                                         atf-bl31 {
>> +                                               filename = "bl31.bin";
> 
>  I have dropped missing-msg = "atf-bl31-sunxi"; and used filename
> section as above.
> 
> Build showing below messages.
> 
>   MKIMAGE u-boot.img
>   MKIMAGE u-boot-dtb.img
>   BINMAN  all
> Image 'main-section' is missing external blobs and is non-functional: scp
> 
> Some images are invalid
> 
> Cannot we make scp as optional for the build?

It already is optional. Even with that warning message,
u-boot-sunxi-with-spl.bin is still created and will still boot.

Now that the missing-msg is merged to mainline, I will add one for SCP firmware
saying it is optional. However, I cannot control the existing binman warning. I
will also explain in the documentation how to silence the warning (with an empty
file).

> Jagan.

Cheers,
Samuel
diff mbox series

Patch

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 82b97a9503f..6ab0c783ba5 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -52,6 +52,7 @@ 
 #endif
 
 					atf-bl31 {
+						filename = "bl31.bin";
 					};
 				};