From patchwork Thu Oct 15 00:43:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 159 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:e04f:0:0:0:0:0 with SMTP id v15csp258689oos; Thu, 15 Oct 2020 02:43:45 -0700 (PDT) X-Received: by 2002:a2e:924d:: with SMTP id v13mr963957ljg.375.1602755025480; Thu, 15 Oct 2020 02:43:45 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602755025; cv=pass; d=google.com; s=arc-20160816; b=EFZ9TNmF3lKiW/iOJ2qxwc4k/OiilNt9XyUCCglthoKHa8dThxH5ymwoY+ccXGrbXr 9xd7lTo5RtLAA0v/0sbKEoN1EZxT5w6wCBjegKNSVxAqy1iwSEctcw7TKCExm71YI9v+ 8CvPT416j74aiPyPYSKjR6n5b5weLUzzIfLTESlgXfMjXUpsTkhbIwhf/mQIsdLYSiYF EPk2Itlbp/zX66y7+TCTxaOihy7eyBUWty2kg4/ov5SROqyZN99BxbUCjPtnYfj3Thte GAczGDQb2ZA2nv5UZmUIURDeQc7kjkZjApae7HIVQngtzm0H/QwXMuWE7rvFT0Dm5S/4 W8dw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=p6al5WY1/oUPGil4WKM9RZAY8ckSB5m4SS1mMFu/Fv4=; b=PJImKr/D0S3AHNEBbwGhw+cIJZWhAFm0rMV8LBS92Gv9vqsCvpCKd1sjI8+NAEHB3X 9ZsbgHK3jhuIJBHXSRRmkC5RQFXaALmFCvNaI2O0bgb46qfTva8KchtMjZDO4tCEckJx eQb0jKBFD8/pJPN3h6tq5fe9EjMbCdtom+xYPkhHjGRYoX1Q2eIFa0/H75beLQLLYtOl WNZv/B471Sc4DTwT9kQiz8GWIlNaRQ4brY0E7UfKHquZqZidhbqKuRzqgeGYr7pE8g90 qxouk7vtWf53TLMlA4SkRZg220JleoBBXc30EUaXrjbI8RZVzMle0WptRS+7hj77q9QZ q09w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=KGHXzOp4; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbuftud6akgqe26lztwq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBUFTUD6AKGQE26LZTWQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id t12sor838182ljo.6.2020.10.15.02.43.45 (Google Transport Security); Thu, 15 Oct 2020 02:43:45 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbuftud6akgqe26lztwq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=KGHXzOp4; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbuftud6akgqe26lztwq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBUFTUD6AKGQE26LZTWQ@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602755025; cv=pass; d=google.com; s=arc-20160816; b=yJYh2tXWN36TMEqA7aOn76szn1Pz7lmgzCvmxUwWOz5uq7eqGjA8CQjuCobi2PP5Ub yGR0Iq/BfKgGuixU/i7Xe5887cOSZvcAPX3LR+Dqt5ydzyRiK7nO81dLX4MNOtt9vIqj 358PLmEmjlm3ecrRE3vwp2sc7CNVxz/Onm2QyywdLsg5KP7bvBAMRfMuJgpH0BL1nn3Y 1Z9MjD2YWdrq2hitUgwFQEbK6LM3+P3kOa2w/Mw3g2cm8OEiUhYoSou1rehj+AgwsN11 PKDNX0VL1P+dhS2FZj2M/1cFLh3S4rzfxYb3N+9Fv7GrOEkzPTBYYpqq0VLrqdxER5y3 krFQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=p6al5WY1/oUPGil4WKM9RZAY8ckSB5m4SS1mMFu/Fv4=; b=aQTxdrud33LlIPEOiQYnEWOAdrKQGB7DGEDWJqZ+RCWmq4n09PjS7id+95lDEIDeLf YlJrNJhxWRxKrZL5rtV3VaJmyk4hffvjUJlDLxNXUgiJotC2hIp/6Xf4wNSsaUF+BR6D b3Ys+hr+PKSPT1PsjayF+6uksjHxqJ+GwEthCelj3MhdB5Wm4mXPuxZcSTfh3+w2+avb U7ZjThoQJ4ZN2G5EIaEo39+05bNIPXabsIyOrwteM+WbSqr5nCpUTHIBAKZPMMFZTVka fpxDzi+c+waqInvd42tDdEvGrN5ceSIh+JHCVreLP1Vv7NhecQv4CejCpAxAWgpfGGVv i2dA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=p6al5WY1/oUPGil4WKM9RZAY8ckSB5m4SS1mMFu/Fv4=; b=KGHXzOp4ukAVWJpR+Rdj1slkIHdnXBYm5Uyt9p3W+2keTET5HsQy1uAaVRbTywZ+pi Qia8qgue+oAEXhN1bWw0XSpC10Tmn8edzFl2kA1+g0YCEjOZF1be49ItNT4ING93kKJ8 b9ZpfIeiVt1sJo38qPPi4N00AM8J4iGTUHAdwh1dm7NHcS6hOu9Nz5hpGMFYkVq9DOIb Xedj3PNFj5BMgaZBxnh68CWEQ6T1VBxsrDK+yvvwFjhIRHEAsnweZD8/7agSDg6l1ceQ pv+IC5jWF57svrJcFEgKzBHAHEnWIhZI0pnkACY+PE256sVluzazZ8p97nEvNOZxFzKA 5r2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=p6al5WY1/oUPGil4WKM9RZAY8ckSB5m4SS1mMFu/Fv4=; b=Fuq8Gx7uSF+TAy2I7DOkhsAZC6pFYx/U07JFZJCtxMRlt+PrvI6RkZI9935o3U5yT7 +4L9BvxuxnSAFGYC9pmQgj1AxSAlfclVsPfoY7M29DzMIpQ8yFtLFdzknwsVCxEqYyRT gZMNZZz08GpcX/kcFVbjaDX/fIV7Y5mqJcZZ92wVKFIq6JbN7C1XAy0l3UohBT2BAwL0 2cVP3LT5RI+Mxy5Yzy59Lu2FNAvLidTroodIWcsUyxYpsTZHPEL5ZSfY2/oRhkLibt0H 02tuDjBqLbkI15ZGD5v35roSKp4Cacjj6NTVG07dskReTwZZhJe+MRkFRc/Bd0iO9bFd 2PNA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533YiCj2L0oq9N9zi67M+3k+p6AGO0NARxgE1Jxp9wa4Xp+bJKtD n+CehAD64VVOq5gg3NiwkvY= X-Google-Smtp-Source: ABdhPJy3WxaUzSafddpOq9STFStTQmFMVLx1ao7t1I6gVuOZ7eMe1VrSlqlF3O0yJIX6YmPP5vYyhg== X-Received: by 2002:a05:651c:1a5:: with SMTP id c5mr979299ljn.273.1602755025131; Thu, 15 Oct 2020 02:43:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c111:: with SMTP id r17ls1341731lff.0.gmail; Thu, 15 Oct 2020 02:43:44 -0700 (PDT) X-Received: by 2002:a19:dc47:: with SMTP id f7mr767712lfj.419.1602755024060; Thu, 15 Oct 2020 02:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602755024; cv=none; d=google.com; s=arc-20160816; b=Ndr2dwCX5MchG7qQSUpG1picpu4MbBADXzR2dxwZKTXDHWV2LiClG2ZYM2z1RhO/cC o6U9XgRPQTmqYCdN7/pfhDsh1SLkQae2uRE7BfcapNrm5KjLxb08fiaU1H/YYtKPfjv5 Bae7XIt1ICBI7+bPMa1tXmM51SOFfcQ4K22U144B4sZlioQP9LuwjggE92k7M2yp9A9X aHMuKDdNDG6fn9bIFqQkotKzX+6HgSuPoK7kwxa8kSk90s5KuIIGdh8XB/cMKBGqxqqy YOuKfgU4jkBZViX3S9RW9sFPkY9pm1GOdCCkACPjaBrvktt1YVrYZgR/2PbQS9/lxbif SYgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=M6LH6O3AsCodcrhIHSZLdU3uZ8GcF2x8R8a07afI3gg=; b=Ki3hBjiDT0IJAIMKURdhGQ2qj+6w9pyWN4lfPpHs1dSsAbE3cO0MjUy2VsnUsa8Sg0 qGwjKLKsVZvbB1n3aoNSraIJGhcb1iLvTxE4DnFFmUT3T3IruDWd+xwTOWJiB9DAPSGS 8fBZVGTLTyFiLYMNBpjtvZ6ryswAkjSugtCS5he8ZSokRu5fEWScXuTClRe6FIXr5zkZ Sx2EhGamx08OijIDco1w4pZmHC3qOzJtAQq2NjdR6H8EHu5bmuaTn29q9VWPwmZ54JdQ mab85mtWUDZ4OGHSFUYUmoxCBgYsbSVM0ubRORFvoXkkH+dFrsFTm1Q1wH0eNixqHZoJ 89MA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id r7si43716ljc.7.2020.10.15.02.43.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2020 02:43:44 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 09F9hhl0015531 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 15 Oct 2020 11:43:43 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.42.243]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 09F9heaj028282 for ; Thu, 15 Oct 2020 11:43:43 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 10/11] meta-isar: u-boot-stm32mp15x: Add patches needed for OP-TEE usage Date: Thu, 15 Oct 2020 11:43:39 +0200 Message-Id: <57c36a6c89ddf097ad5a593ba425deb5e9593de9.1602755020.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1680610453883855119?= X-GMAIL-MSGID: =?utf-8?q?1680610453883855119?= From: Jan Kiszka These two patches didn't make it into 2020.10 but are needed in order to boot Linux when OP-TEE is present. See also https://www.mail-archive.com/u-boot@lists.denx.de/msg386193.html Signed-off-by: Jan Kiszka --- ...y-add-property-no-map-to-created-res.patch | 151 ++++++++++++++++++ ...rty-no-map-to-secure-reserved-memory.patch | 33 ++++ .../u-boot/u-boot-stm32mp15x_2020.10.bb | 4 + 3 files changed, 188 insertions(+) create mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch create mode 100644 meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch diff --git a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch b/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch new file mode 100644 index 00000000..8a32fc11 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch @@ -0,0 +1,151 @@ +From ccaa5747bdeae4261199dd7e80771e4de1c550ca Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Thu, 10 Sep 2020 10:49:59 +0200 +Subject: [PATCH] fdtdec: optionally add property no-map to created reserved + memory node + +Add boolean input argument @no_map to helper function +fdtdec_add_reserved_memory() to add or not "no-map" property +for an added reserved memory node. + +Property no-map is used by the Linux kernel to not not map memory +in its static memory mapping. It is needed for example for the| +consistency of system non-cached memory and to prevent speculative +accesses to some firewalled memory. + +No functional change. A later change will update to OPTEE library to +add no-map property to OP-TEE reserved memory nodes. + +Signed-off-by: Etienne Carriere +Signed-off-by: Patrice Chotard +Reviewed-by: Simon Glass +--- + arch/riscv/lib/fdt_fixup.c | 2 +- + include/fdtdec.h | 5 +++-- + lib/fdtdec.c | 10 ++++++++-- + lib/optee/optee.c | 2 +- + test/dm/fdtdec.c | 6 +++--- + 5 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c +index 5b2420243f..d02062fd5b 100644 +--- a/arch/riscv/lib/fdt_fixup.c ++++ b/arch/riscv/lib/fdt_fixup.c +@@ -75,7 +75,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, void *dst) + pmp_mem.start = addr; + pmp_mem.end = addr + size - 1; + err = fdtdec_add_reserved_memory(dst, basename, &pmp_mem, +- &phandle); ++ &phandle, false); + if (err < 0 && err != -FDT_ERR_EXISTS) { + log_err("failed to add reserved memory: %d\n", err); + return err; +diff --git a/include/fdtdec.h b/include/fdtdec.h +index 152eb07b9e..62d1660973 100644 +--- a/include/fdtdec.h ++++ b/include/fdtdec.h +@@ -1029,7 +1029,7 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle) + * }; + * uint32_t phandle; + * +- * fdtdec_add_reserved_memory(fdt, "framebuffer", &fb, &phandle); ++ * fdtdec_add_reserved_memory(fdt, "framebuffer", &fb, &phandle, false); + * + * This results in the following subnode being added to the top-level + * /reserved-memory node: +@@ -1056,11 +1056,12 @@ static inline int fdtdec_set_phandle(void *blob, int node, uint32_t phandle) + * @param carveout information about the carveout region + * @param phandlep return location for the phandle of the carveout region + * can be NULL if no phandle should be added ++ * @param no_map add "no-map" property if true + * @return 0 on success or a negative error code on failure + */ + int fdtdec_add_reserved_memory(void *blob, const char *basename, + const struct fdt_memory *carveout, +- uint32_t *phandlep); ++ uint32_t *phandlep, bool no_map); + + /** + * fdtdec_get_carveout() - reads a carveout from an FDT +diff --git a/lib/fdtdec.c b/lib/fdtdec.c +index 56bf9fcc79..b8fc5e2bff 100644 +--- a/lib/fdtdec.c ++++ b/lib/fdtdec.c +@@ -1316,7 +1316,7 @@ static int fdtdec_init_reserved_memory(void *blob) + + int fdtdec_add_reserved_memory(void *blob, const char *basename, + const struct fdt_memory *carveout, +- uint32_t *phandlep) ++ uint32_t *phandlep, bool no_map) + { + fdt32_t cells[4] = {}, *ptr = cells; + uint32_t upper, lower, phandle; +@@ -1416,6 +1416,12 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, + if (err < 0) + return err; + ++ if (no_map) { ++ err = fdt_setprop(blob, node, "no-map", NULL, 0); ++ if (err < 0) ++ return err; ++ } ++ + /* return the phandle for the new node for the caller to use */ + if (phandlep) + *phandlep = phandle; +@@ -1481,7 +1487,7 @@ int fdtdec_set_carveout(void *blob, const char *node, const char *prop_name, + fdt32_t value; + void *prop; + +- err = fdtdec_add_reserved_memory(blob, name, carveout, &phandle); ++ err = fdtdec_add_reserved_memory(blob, name, carveout, &phandle, false); + if (err < 0) { + debug("failed to add reserved memory: %d\n", err); + return err; +diff --git a/lib/optee/optee.c b/lib/optee/optee.c +index 457d4cca8a..963c2ff430 100644 +--- a/lib/optee/optee.c ++++ b/lib/optee/optee.c +@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob) + ret = fdtdec_add_reserved_memory(new_blob, + nodename, + &carveout, +- NULL); ++ NULL, false); + free(oldname); + + if (ret < 0) +diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c +index 716993f706..4119003041 100644 +--- a/test/dm/fdtdec.c ++++ b/test/dm/fdtdec.c +@@ -80,7 +80,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) + resv.start = 0x1000; + resv.end = 0x1fff; + ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region", +- &resv, &phandle)); ++ &resv, &phandle, false)); + + /* Test /reserve-memory and its subnode should exist */ + parent = fdt_path_offset(blob, "/reserved-memory"); +@@ -101,7 +101,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) + resv.start = 0x2000; + resv.end = 0x2fff; + ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region1", +- &resv, &phandle1)); ++ &resv, &phandle1, false)); + subnode = fdt_path_offset(blob, "/reserved-memory/rsvd_region1"); + ut_assert(subnode > 0); + +@@ -115,7 +115,7 @@ static int dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) + resv.start = 0x1000; + resv.end = 0x1fff; + ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region2", +- &resv, &phandle1)); ++ &resv, &phandle1, false)); + subnode = fdt_path_offset(blob, "/reserved-memory/rsvd_region2"); + ut_assert(subnode < 0); + +-- +2.26.2 + diff --git a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch b/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch new file mode 100644 index 00000000..6a39968b --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch @@ -0,0 +1,33 @@ +From 3e15c315f97401f394ae83ed17fbef72b765222a Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Thu, 10 Sep 2020 10:50:01 +0200 +Subject: [PATCH] optee: add property no-map to secure reserved memory + +OP-TEE reserved memory node must set property "no-map" to prevent +Linux kernel from mapping secure memory unless what non-secure world +speculative accesses of the CPU can violate the memory firmware +configuration. + +Fixes: 6ccb05eae01b ("image: fdt: copy possible optee nodes to a loaded devicetree") +Signed-off-by: Etienne Carriere +Signed-off-by: Patrice Chotard +--- + lib/optee/optee.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/optee/optee.c b/lib/optee/optee.c +index 963c2ff430..9e6606568f 100644 +--- a/lib/optee/optee.c ++++ b/lib/optee/optee.c +@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob) + ret = fdtdec_add_reserved_memory(new_blob, + nodename, + &carveout, +- NULL, false); ++ NULL, true); + free(oldname); + + if (ret < 0) +-- +2.26.2 + diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb index 6d956434..39fceb2f 100644 --- a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb +++ b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb @@ -4,3 +4,7 @@ # SPDX-License-Identifier: MIT require u-boot-${PV}.inc + +SRC_URI += " \ + file://0001-fdtdec-optionally-add-property-no-map-to-created-res.patch \ + file://0002-optee-add-property-no-map-to-secure-reserved-memory.patch"