From patchwork Thu May 7 23:20:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 245295 List-Id: U-Boot discussion From: samuel at sholland.org (Samuel Holland) Date: Thu, 7 May 2020 18:20:34 -0500 Subject: [PATCH 2/3] mksunxi_fit_atf.sh: Update FIT component descriptions In-Reply-To: <20200507232035.31892-1-samuel@sholland.org> References: <20200507232035.31892-1-samuel@sholland.org> Message-ID: <20200507232035.31892-2-samuel@sholland.org> 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. Signed-off-by: Samuel Holland Acked-by: Patrick Wildt --- board/sunxi/mksunxi_fit_atf.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh index 88ad719747..4dfd22db78 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