random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

sunxi: binman: Update FIT component descriptions

Browse Source 
Since commit d879616e9e64 ("spl: fit: simplify logic for FDT loading for
non-OS boots"), the SPL looks at the "os" properties of FIT images to
determine where to append the FDT.

The "os" property of the "firmware" image also determines how to execute
the next stage of the boot process, as in 1d3790905d9c ("spl: atf:
introduce spl_invoke_atf and make bl31_entry private"). For this reason,
the next stage must be specified in "firmware", not in "loadables".

To support this additional functionality, and to properly model the boot
process, where ATF runs before U-Boot, add the "os" properties and swap
the firmware/loadable images in the FIT image.

Since this description was copied as an example in commit 70248d6a2916
("binman: Support generating FITs with multiple dtbs"), update those
examples as well for correctness and consistency.

Acked-by: Patrick Wildt <patrick@blueri.se>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Samuel Holland 2020-10-21 21:12:14 -05:00 committed by Jagan Teki
parent cf70553e2c
commit 68158d59d2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/dts/sunxi-u-boot.dtsi
View File

@ -35,6 +35,7 @@
uboot { uboot {
description = "U-Boot (64-bit)"; description = "U-Boot (64-bit)";
type = "standalone"; type = "standalone";
os = "u-boot";
arch = "arm64"; arch = "arm64";
compression = "none"; compression = "none";
load = <0x4a000000>; load = <0x4a000000>;
@ -46,6 +47,7 @@
atf { atf {
description = "ARM Trusted Firmware"; description = "ARM Trusted Firmware";
type = "firmware"; type = "firmware";
os = "arm-trusted-firmware";
arch = "arm64"; arch = "arm64";
compression = "none"; compression = "none";
load = <BL31_ADDR>; load = <BL31_ADDR>;
@ -69,8 +71,8 @@
@config-SEQ { @config-SEQ {
description = "NAME"; description = "NAME";
firmware = "uboot"; firmware = "atf";
loadables = "atf"; loadables = "uboot";
fdt = "fdt-SEQ"; fdt = "fdt-SEQ";
}; };
}; };

4
tools/binman/README.entries
View File

@ -385,8 +385,8 @@ You can create config nodes in a similar way:
default = "@config-DEFAULT-SEQ"; default = "@config-DEFAULT-SEQ";
@config-SEQ { @config-SEQ {
description = "NAME"; description = "NAME";
firmware = "uboot"; firmware = "atf";
loadables = "atf"; loadables = "uboot";
fdt = "fdt-SEQ"; fdt = "fdt-SEQ";
}; };
}; };

4
tools/binman/etype/fit.py
View File

@ -73,8 +73,8 @@ class Entry_fit(Entry):
default = "@config-DEFAULT-SEQ"; default = "@config-DEFAULT-SEQ";
@config-SEQ { @config-SEQ {
description = "NAME"; description = "NAME";
firmware = "uboot"; firmware = "atf";
loadables = "atf"; loadables = "uboot";
fdt = "fdt-SEQ"; fdt = "fdt-SEQ";
}; };
}; };