mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH 4/4] start: reserve OP-TEE memory for PBL-OPTEE
Date: Mon,  2 Nov 2020 10:30:02 +0100	[thread overview]
Message-ID: <20201102093002.15851-4-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20201102093002.15851-1-r.czerwinski@pengutronix.de>

Instead of only adding the reserved memory entry in case of an OP-TEE
start before the kernel, also do this in case we may have started OP-TEE
during the PBL.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 arch/arm/cpu/start.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 5f43f9e546..0abe92036b 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -238,7 +238,7 @@ __noreturn __no_sanitize_address void barebox_non_pbl_start(unsigned long membas
 
 	mem_malloc_init((void *)malloc_start, (void *)malloc_end - 1);
 
-	if (IS_ENABLED(CONFIG_BOOTM_OPTEE))
+	if (OPTEE_SIZE > 0)
 		of_add_reserve_entry(endmem - OPTEE_SIZE, endmem - 1,
 				OF_RESERVE_ENTRY_FLAG_UNCACHED);
 
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-11-02  9:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02  9:29 [PATCH 1/4] of: reserve: add uncached flag mem entries Rouven Czerwinski
2020-11-02  9:30 ` [PATCH 2/4] arm: mmu: traverse reserved mem map as uncached Rouven Czerwinski
2020-11-02 10:19   ` Ahmad Fatoum
2020-11-02  9:30 ` [PATCH 3/4] mmu-early: remove OP-TEE from the MMU mapping Rouven Czerwinski
2020-11-02 10:22   ` Ahmad Fatoum
2020-11-02 10:36     ` Ahmad Fatoum
2020-11-02  9:30 ` Rouven Czerwinski [this message]
2020-11-02 10:23   ` [PATCH 4/4] start: reserve OP-TEE memory for PBL-OPTEE Ahmad Fatoum
2020-11-02 10:14 ` [PATCH 1/4] of: reserve: add uncached flag mem entries Ahmad Fatoum

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=20201102093002.15851-4-r.czerwinski@pengutronix.de \
    --to=r.czerwinski@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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