Message ID | 20200903060815.2467-2-samuel@sholland.org |
---|---|
State | Changes Requested |
Delegated to: | Jagannadha Sutradharudu Teki |
Headers | show |
Series | [v2,1/3] spl: fit: Minimally parse OS properties with FIT_IMAGE_TINY | expand |
Hi Samuel, On Thu, 3 Sep 2020 at 00:08, Samuel Holland <samuel@sholland.org> wrote: > > 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"). > > 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. > > Acked-by: Patrick Wildt <patrick@blueri.se> > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > > Changes since v1: > - Collect tags > > --- > board/sunxi/mksunxi_fit_atf.sh | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) This is moving to use binman so please check u-boot-dm/next. Regards, Simon
diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh index 88ad7197470..4dfd22db781 100755 --- a/board/sunxi/mksunxi_fit_atf.sh +++ b/board/sunxi/mksunxi_fit_atf.sh @@ -31,6 +31,7 @@ cat << __HEADER_EOF description = "U-Boot (64-bit)"; data = /incbin/("u-boot-nodtb.bin"); type = "standalone"; + os = "u-boot"; arch = "arm64"; compression = "none"; load = <0x4a000000>; @@ -39,6 +40,7 @@ cat << __HEADER_EOF description = "ARM Trusted Firmware"; data = /incbin/("$BL31"); type = "firmware"; + os = "arm-trusted-firmware"; arch = "arm64"; compression = "none"; load = <$BL31_ADDR>; @@ -73,8 +75,8 @@ do cat << __CONF_SECTION_EOF config_$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot"; - loadables = "atf"; + firmware = "atf"; + loadables = "uboot"; fdt = "fdt_$cnt"; }; __CONF_SECTION_EOF