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.
Signed-off-by: Samuel Holland samuel@sholland.org ---
I tested this and verified it to work. The key code is from tools/binman/etype/blob_named_by_arg.py: super().__init__(...) filename, = self.GetEntryArgsOrProps(...) if filename: self._filename = filename
If `filename` is the empty string, it evaluates to False, and the filename set from the DT property in the superclass constructor is not overwritten.
--- 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"; }; };