From: Samuel Holland <samuel@sholland.org>
To: u-boot@lists.denx.de
Subject: [PATCH v2 2/3] mksunxi_fit_atf.sh: Update FIT component descriptions
Date: Thu, 3 Sep 2020 01:08:14 -0500 [thread overview]
Message-ID: <20200903060815.2467-2-samuel@sholland.org> (raw)
In-Reply-To: <20200903060815.2467-1-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.
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(-)
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
--
2.26.2
next prev parent reply other threads:[~2020-09-03 6:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 6:08 [PATCH v2 1/3] spl: fit: Minimally parse OS properties with FIT_IMAGE_TINY Samuel Holland
2020-09-03 6:08 ` Samuel Holland [this message]
2020-09-05 20:51 ` [PATCH v2 2/3] mksunxi_fit_atf.sh: Update FIT component descriptions Simon Glass
2020-09-03 6:08 ` [PATCH v2 3/3] sunxi: Add support for including SCP firmware Samuel Holland
2020-09-05 20:51 ` Simon Glass
2020-09-03 13:45 ` [PATCH v2 1/3] spl: fit: Minimally parse OS properties with FIT_IMAGE_TINY Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200903060815.2467-2-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.