From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
To: u-boot@lists.denx.de, trini@konsulko.com, patrick.delaunay@foss.st.com
Cc: Alexandru Gagniuc <mr.nuke.me@gmail.com>,
sjg@chromium.org, etienne.carriere@linaro.org
Subject: [PATCH v4 1/5] spl: mmc: Support OP-TEE payloads in Falcon mode
Date: Mon, 31 May 2021 12:43:10 -0500 [thread overview]
Message-ID: <20210531174314.1395666-2-mr.nuke.me@gmail.com> (raw)
In-Reply-To: <20210531174314.1395666-1-mr.nuke.me@gmail.com>
In general, Falcon mode means we're booting a linux kernel directly.
With FIT images, however, an OP-TEE secure kernel can be booted before
linux. Thus, if the next stage is an IH_OS_TEE, this isn't necessarily
a problem.
Of course, a general solution would involve mmc_load_image_raw_os()
only loading the binary, and leaving the decision of suitability to
someone else. However, a rework of the boot flow is beyond the scope
of this patch. Accept IH_OS_TEE as a valid OS value.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---
common/spl/spl_mmc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index add2785b4e3..bab558d055f 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -230,8 +230,10 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
if (ret)
return ret;
- if (spl_image->os != IH_OS_LINUX) {
- puts("Expected Linux image is not found. Trying to start U-boot\n");
+ if (spl_image->os != IH_OS_LINUX && spl_image->os != IH_OS_TEE) {
+ puts("Expected OS image is not found. Instead found ");
+ puts(genimg_get_os_name(spl_image->os));
+ puts(". Trying to start U-boot\n");
return -ENOENT;
}
--
2.31.1
next prev parent reply other threads:[~2021-05-31 17:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 17:43 [PATCH v4 0/5] stm32mp: Enable OP-TEE and TZC support in SPL Alexandru Gagniuc
2021-05-31 17:43 ` Alexandru Gagniuc [this message]
2021-07-15 18:27 ` [PATCH v4 1/5] spl: mmc: Support OP-TEE payloads in Falcon mode Patrick DELAUNAY
2021-07-15 19:11 ` Alex G.
2021-07-15 19:19 ` [PATCH v5 0/5] stm32mp: Enable OP-TEE and TZC support in SPL Alexandru Gagniuc
2021-07-15 19:19 ` [PATCH v5 1/5] spl: mmc: Support OP-TEE payloads in Falcon mode Alexandru Gagniuc
2021-07-27 9:12 ` Patrick DELAUNAY
2021-07-15 19:19 ` [PATCH v5 2/5] spl: Introduce spl_board_prepare_for_optee() hook Alexandru Gagniuc
2021-07-27 9:13 ` Patrick DELAUNAY
2021-07-15 19:19 ` [PATCH v5 3/5] arm: stm32mp: Implement support for TZC 400 controller Alexandru Gagniuc
2021-07-27 9:14 ` Patrick DELAUNAY
2021-07-15 19:19 ` [PATCH v5 4/5] stm32mp1: spl: Configure TrustZone controller for OP-TEE Alexandru Gagniuc
2021-07-27 9:14 ` Patrick DELAUNAY
2021-07-15 19:19 ` [PATCH v5 5/5] ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb Alexandru Gagniuc
2021-07-27 9:15 ` Patrick DELAUNAY
2021-07-25 15:08 ` [PATCH v5 0/5] stm32mp: Enable OP-TEE and TZC support in SPL Alex G.
2021-05-31 17:43 ` [PATCH v4 2/5] spl: Introduce spl_board_prepare_for_optee() hook Alexandru Gagniuc
2021-05-31 17:43 ` [PATCH v4 3/5] arm: stm32mp: Implement support for TZC 400 controller Alexandru Gagniuc
2021-05-31 17:43 ` [PATCH v4 4/5] stm32mp1: spl: Configure TrustZone controller for OP-TEE Alexandru Gagniuc
2021-07-08 13:23 ` Patrice CHOTARD
2021-07-09 9:03 ` Patrick DELAUNAY
2021-05-31 17:43 ` [PATCH v4 5/5] ARM: dts: stm32mp: Add OP-TEE reserved memory to SPL dtb Alexandru Gagniuc
2021-06-01 15:02 ` Patrick DELAUNAY
2021-07-06 15:18 ` [PATCH v4 0/5] stm32mp: Enable OP-TEE and TZC support in SPL Alex G.
2021-07-06 15:45 ` Tom Rini
2021-07-06 15:55 ` Alex G.
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=20210531174314.1395666-2-mr.nuke.me@gmail.com \
--to=mr.nuke.me@gmail.com \
--cc=etienne.carriere@linaro.org \
--cc=patrick.delaunay@foss.st.com \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox