From patchwork Sun Nov 22 21:53:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 187 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp2785384oou; Sun, 22 Nov 2020 23:54:04 -0800 (PST) X-Received: by 2002:a19:ca57:: with SMTP id h23mr1419773lfj.12.1606118044691; Sun, 22 Nov 2020 23:54:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606118044; cv=pass; d=google.com; s=arc-20160816; b=bdHhF3CPYV7N+fDA0IRrtKIBGrLn+QFUVXrQ9I9RNZJaYWAjLT8a3WVgsUnZc/OLus kxFlxGM4DUXPbBIdbQHvZwAINYNJE/49tUt9QmKMgHKl+kwNbvf5Cd6wk+T++BWjxB1C lMB5EAXspmMshsZagQ7VwnLpKVe95ac7oxHRykh6hH7I+FYwgBXwM0PETNWI/z9lmHMn qcaEx4gAqxBc6R70SvgDXzrF2isvbIk2WSIuovBHmuFAOBITJoRHEwJLU0Ka1X9Ri0Yp fl+aJYzSNrUcvYrTDgp+kEzOBKmH9WWAB6WsIJixVLTXWl9g7K+4kHFuYSgXE+ATUwFF /dLQ== 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=58yJNldqvLeOV9/wAj6MDVW7FEnP9d0PGRyYj0dmLFc=; b=t4FVxzitGxT41JqdzquoHDqxerf9V4iXk5DOR5xy+7qh3KSM8c9KUtK80UgYNXN6O9 WtSaDsQh1oZk8AW4uKS1MoVl74i65NQH6tKS5fMhBJImeanVrMnbY4XsLWylkmaUUyg4 Ucv0xbkfRvQgS8MatHp8vcYGS9yGaNP64RUxrzmsSvDoNjzTDua+GQvr7JpDIn5kCP9H aBTxkrrsnW3HZHlCI5Xo0Q6C7RmUIIGyxiS9Ca47tbm0Q97D/3KS3oQo2f3h5xPrlXto PFb3g+t3jnKb6O8TOcMlk4LBkqGlm5cdHOH1M5CfaM/wl2euhCcxx/uSjf/drHeu6cpN ZtpQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jsyj4aO0; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbhgv5x6qkgqeu7ur3ka@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBHGV5X6QKGQEU7UR3KA@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 n5sor1946255lfh.54.2020.11.22.23.54.04 (Google Transport Security); Sun, 22 Nov 2020 23:54:04 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbhgv5x6qkgqeu7ur3ka@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=jsyj4aO0; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbhgv5x6qkgqeu7ur3ka@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBHGV5X6QKGQEU7UR3KA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1606118044; cv=pass; d=google.com; s=arc-20160816; b=Xq0kRhxFmtjzW55I5RD37lTqQ/FOTg0WYR1PTGJ0CS3WgE3Ts3TvCQBuVT+MWMKz5/ Vvrh2rrkDi0p6aScHWfcSL0/+pQQHEUIfigxNS//uk0p2eSOaj4MT2XtIZewAxupbblw bkKQm6Iz6YlTrtPD7EQqqo23CfZKGSHVtW1AkJk2elCknYBWLHplh3aMfCwbx2f+gTkq cXltco5AN7WK4DArVEE6jiK5kKjgJ3bb8YOxA/aLndZVZHGnqhAdF1LPwMVQbBHBguTM 9PwIvAivOGJsOC+gL8tGauaamtD3nUboHuOwKaYRtoyNhY9lKxLWSQBFQQ6KFpe3hMJ4 0bcQ== 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=58yJNldqvLeOV9/wAj6MDVW7FEnP9d0PGRyYj0dmLFc=; b=WiHCGkRZhlwnNE0TN96fNs+J7rGTqUEQpiMwTAUHoHzLtpxD8qMAxx/UiyKkHHQwnV jGX/QmLfl0P/v4ZrVbiXsxnoo/FvkSb6O0kO2v4QxneTJ6QnKHMMB7KLKSab1fTBh6NH kmrpQD7Vidq2Ystx+S3m+/DALXtKAdqeTpy5dxv45+MstLR6D1u+6GZmiBzwEfMMLBLZ donrtGFtqpwIej8FUZ1UINu/e6UmKexSzRLV8x3yJWAgCeeqCTkN8UHEO8KMjq1cSjgK 8her82snKAxi4zbTM5PFNnLUqA3wMxmAPtERbKCX1xRUNkc22gV/ucnTGkPyat9s16Bu 6vFA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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=58yJNldqvLeOV9/wAj6MDVW7FEnP9d0PGRyYj0dmLFc=; b=jsyj4aO05+sK5nLAma5CTV9CPLPM+cmxMK8ouYa/0rQ4n2bfDkKAkRjPHNMMNm0hYf 60b53Nu5zJgw6LGJPLcGSoiBXKqpmV+yW10ON50uCD8FFVeNY34kdwn+NOJH75SOHGfq g6unQ7RWTrSPKPVkU9hk4fUTo2Qop0MmK6z4aMru9BftLO/QzlnZ1TTnKucbJ5OTs2yV 5aOuLLBUd5CMFNPlOOHAbFvdnr6CeVOV75CjyjPBibgULwlbc6n3jEwbuA4PwXYMY8Bm 4bdsqR49eWRpa7ikQJDxVzrqbSozZ+pQritUnooyp1pqCjIpNBr3edTfSHDLyCbv/uzg dozA== 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=58yJNldqvLeOV9/wAj6MDVW7FEnP9d0PGRyYj0dmLFc=; b=BjuoQShbdpYjdS6YRMN4YSmK4YeWGwWy0ba4RmPTOj1bg4y7/3n1pvTlJzceU0vqVc uvcKBYuOw4YMXqsOxwa0KxCwaNDa5aD7qfmFA2AdYAz+iiJA2hoA3WI2bZoaYYQVWrcq JC8uoyC7jI5vwpY3/tHWfn9C4Io9YwNVCDviiwNVy69cyoFuofR05OoNl+YdrHelvwq5 ccEGStVsVTp9xwB3JW9eSEa+YW8/SD48nx4nE0h6mluVHlF1eyEnNTNtLapvL/WjvS4x ZLVr4Y+haQ+V25fWchtc50UWh7aU/GXrVAOiZDbqo3+q3jKWwDSdT8H4p5UctadzuF6m 2nOQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532nNibBz98QIp9NzapHA+P/3DSY0r6BAlgb1CidIGeVn9ny201z MvIHrqPXNtFUL5CEi+hhhJ4= X-Google-Smtp-Source: ABdhPJxPhJS9JlWDIPOdMf9E7BTyp8T1XF5/+Vgf1X4kROtmpS/mIWY719mhJuQte/xzb4hb4C2n1g== X-Received: by 2002:a19:e20c:: with SMTP id z12mr13705277lfg.450.1606118044329; Sun, 22 Nov 2020 23:54:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:881a:: with SMTP id x26ls421008ljh.2.gmail; Sun, 22 Nov 2020 23:54:03 -0800 (PST) X-Received: by 2002:a2e:b8d4:: with SMTP id s20mr13102368ljp.226.1606118043190; Sun, 22 Nov 2020 23:54:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606118043; cv=none; d=google.com; s=arc-20160816; b=NQ0p8iXi6k6ERVx1PFSZFDAtZsF2e/RU2Td+UhWhjotwgUrNdLnXyF2WPbG/EzeRKR QJsO65ocmvJ6tsiBIp01WQFdRr10yq/gHSwM46NYF6vmk/FT+/xdKwAYoIGQAIvSzOOJ bbUMAxlBrRfBWJKgdv17Y44hE9qpiPDjHR1ix4qCcQCGPWwgY0pg0dulpJ8p6ZVXRKnB Prjp2/QvDn3W8+pqa/g6HMbNyeOI63iQtmCW0caKDGdmxhbIo2wmTjjrDqPzgNe8xY0v o2vWS9MYrUW81ecC9bbbGSnJ1TEiyRA6iTnICREUEmXXnXN+E4A7IAj+kYN13LYVbrEO Bqgg== 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=lf8Ki3W7QuXBJ+4gny1hMiYjJa1+bKQ4SoEhdHaConIYQ3jfFM2NtFuGdgSs2vBWci lBqtc0K9lQeebUJqFpMcMT1wUZY8+N5r8Brw/QobQjUdiqJ3eTudnbbjyzQTwBw9UHg8 bBisHCLrmlYLYZEr/R9JMsE3dhMI+jpTC2jdSUdOt/Sl/fAod3BBzdH8t/ccqi28qPYp SZxxbBYS3pl3UOHXbVcTjHDXZyuXBqkJuQRueXGcfJIZUjRjAnZnhEerQgu+Zt7ABrpg w0/nq+l47hetYfs0oBR/AMziFGJd026vuSZG0Sf0qsXXs3d/278vvtxSkEMdzrwX7K9u pLBQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id 206si55781lff.4.2020.11.22.23.54.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2020 23:54:03 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 0AN7s240020617 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Nov 2020 08:54:02 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0AN7rxU0017265 for ; Mon, 23 Nov 2020 08:54:02 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v4 10/11] meta-isar: u-boot-stm32mp15x: Add patches needed for OP-TEE usage Date: Mon, 23 Nov 2020 08:53:58 +0100 Message-Id: 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 194.138.37.39 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?1684136835326002807?= X-GMAIL-MSGID: =?utf-8?q?1684136835326002807?= 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"