From patchwork Sun Nov 21 21:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1100 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 22 Nov 2021 08:28:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f188.google.com (mail-pl1-f188.google.com [209.85.214.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1AM7ShVu003196 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 08:28:44 +0100 Received: by mail-pl1-f188.google.com with SMTP id e9-20020a170902ed8900b00143a3f40299sf6987126plj.20 for ; Sun, 21 Nov 2021 23:28:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1637566118; cv=pass; d=google.com; s=arc-20160816; b=r/hdwy55fd7pe1Z6zlO7/XfBopy1uSLJtLMI/0u8uFAFy06WBZFRCcvT7bXMfb7Ta6 KnCgzfiIGl5BT6p0ujbVC6U04MB3Faurp6lj4O5yRslZXdJnQ8DtkLd4NiNO1NxEypec mE4MnuboFfpW4rEeHmMMsp5JdFHxNgazfyK8N5qmouw0hibQvqwGcT9MKj6G223d5ULJ nTSQBSfwJhy4sunKB+gK/elW0MdXJM3FL9xWiv/DhNPeRV6MkvE49Bu6mSgnVRqNIy0D Jq9NnKYfq74dEHokjljbZb1ULesY1KOVFOexX1SLLppHCa6qePnXISYb/FSv2YCwtWFh T0Pw== 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:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=oqJJ5p3GgyKEU+caySiztaDC6MlIsw0lsJ1t86KOquQ=; b=JT7rBDvVt3OH9XElipOStrlzn4P0cLF+3hYbz3LonqrK2pKvjdq80hqvmyGMS3Mdo/ 6BgrZ9QR1NU7pn5wA0obiSPXqVK+hrSOQ07SWu93dEhg5I1TntZec7cWG3xpXPVuS3Xv oF86KsjpCeqVNtU2WwBc0Zd0acfyFd5pTikD9fQ/alCeKkD/0lh9/4s+KW0Q1cAB7Jmf 0xM6CKkZQiZMaNAkk1CMDXFaXgE7sopRSmieokoqEZsmOL5gKi9yzFLOpRe+i+B+gNGE SsRgauvZDK7oIjqIdjMm76svfKRzuSUXTUDX+Ji20Y+BkPQohkJEspcwxp319ulFkKTw bbtQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:ironport-sdr:from:to:cc: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=oqJJ5p3GgyKEU+caySiztaDC6MlIsw0lsJ1t86KOquQ=; b=J9oruPEsQwfNUgALELEx+OTufh7FT4tQkyBa/C9YXdW0msoopfKgPv8vh8zHRgUxZB y9od5iTnq8MFUw70lXrKlnuPgYzUw2zsbiXrJDhXrwm4nqc8LoWpIN/yww1HLgbwlN1M v6OfgDKZ11FxhDkNYyouB2ObRnXBi7PYVaJKYGaLRwzIXGDJq7ebQOh+OnGfXkNvWJ7L tn74uyjCYuXgEDDd02haEyVy/LUbxKkOZcf0rNk4PognoSrYmSeT5Pp2pzHrBVI25VsX vtKDZxsBHx9hcXV+ViEtPxMmuLQJ3HBM1LAuEFezeJuKvz/7NtVRanXxbkWirDgzWBro O6aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :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=oqJJ5p3GgyKEU+caySiztaDC6MlIsw0lsJ1t86KOquQ=; b=WCH3rJ3dwwPsRNHZCIqin3MxlLRuX69x6jbYpFVi6o3m/Mb53/Ggkq+7jW8aw9Met+ qs7P40nZAKT7lIMOvfcF7TsW+HFYBpw3GBnreFNMwYmMPZNHtCrHMav0gOxdJUoft3JP dP+YgZP4rkUvL9z9oseggSCGc44lsaxJxbr1xZJfWo35nN7uo6QPHojL9rAVCL1EOHzG 7Hkh/GiEs2AdLW9ZiKOvmX3t3AcD6+x6hMzDIU5O/ZvD3IlYtTzPUcIzgP/g8Z3kRMe1 sZZSonILyRF9UtvkH9oNeqO/JeyrxLdOSuJLf0GJ7Njk2OcX+Jrv/t9gyEZ0iIp9lV29 f4Mg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533rtjB5+daoJoxK8EQtQeOuRh0hF0kRSH51cHfzXUyHijPfv6en EUkXQWvYqO7QTGx7KzWuqdg= X-Google-Smtp-Source: ABdhPJyW4e6+Et5u6hfpuasQiQY/8mRGj1ScfnHWcypU1MZgMeMzmAsS+xsy6pV6Qm60fY5+EK2FeQ== X-Received: by 2002:a62:1d09:0:b0:4a2:82d7:17a5 with SMTP id d9-20020a621d09000000b004a282d717a5mr71816865pfd.64.1637566117910; Sun, 21 Nov 2021 23:28:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:1c05:: with SMTP id c5ls1434844pgc.6.gmail; Sun, 21 Nov 2021 23:28:37 -0800 (PST) X-Received: by 2002:a65:6554:: with SMTP id a20mr31627594pgw.107.1637566117131; Sun, 21 Nov 2021 23:28:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637566117; cv=none; d=google.com; s=arc-20160816; b=VKQqtXYUk0XtFPnr/neq6cAN4qD1LU+x00/uiuEtrtLl3FYaZpbP1V2mU0ToZ0Lh0q tsI/0GBakDnOviGM6pIYUxfNqZ9hKKU98AT4bxyJnWUmWSJBfjIgki2x+WhCVqBi5j0d WQ/nCxS4/E8p0glqXmHKxXDD2aFHQ+WIRRspzxmxCAJNfjBfI+GVs0u7ER//bpMkFnWE +zo/CqQjUHtZjKZU/e0EdNQdDpSpacnP2fcSBQkqZB97oj0CiJFMSgL7PFJIhmkguLAy tfaEgxIKIQWpa8uFq2J8N9vOOwisiTqQzCOXcGcn+FO8VEx2c5zfFBgwOY6YhB3zYkL7 pJCA== 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:cc:to:from:ironport-sdr:ironport-sdr; bh=CmUmqtHg1IFpwoy43Nd2Z7NtHAZ+ERkzRcpajJzIriU=; b=j8FA/EHxQSchbzidvhFyKvCKLJ9H98NzAMJzH4P85aglAt+u/SLcI8QHyhyX5ICHjL er92DHSHe/tcc923gyloM4pjYNoPIbNIW/ksYbBuGtswYatAaaRtyanr3c2JEleQ971r ZfQhDrC3OA/OMuBNQN5ZHhcuAMor2qVdzoVRgNXWPzig4jFBwfDOeidW10snRaVrU6YK IJULBy2fLsIbjHKQEhmf8UKuugpW5j2fu7JFyNoZhDInmnk768aVVLRWdDD+qHGIeZ5/ aMBVv5n8ptk+CP7D2+EY4TZmduDNEby//h2JcIw3KDtd0bbgDYlpq8qp8UF60o48lZz9 7tYw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id p10si389241plr.4.2021.11.21.23.28.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Nov 2021 23:28:37 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; IronPort-SDR: i8rzGY8xhEHn6u3aI/gVLgJl6wei7B1zlSYfz82Es9SxxmdLPajjknVxHpzcAt33Ko8ucOOdyH IhpI5cSvAL5LaYlXJDQpk4ENgZEIaXRu1LBuut6AGgXCMZYqXlpsJ+KhYgmZ3UC3KZIqafaOMS FTBg2FKGR+RBzkPOuDTYGiNHoN8hWIprX1i0QrK99ZGhzokI94tbN5id64pQJgLsdOUcD/hTae K7lmXTZLoFVvypqn4YWhJIm4w614mp131nXFE/VER9NFX9TwuB6xdnZYQUHwAnyzU/0WI+Jr5j zYrMI0xc+6jCKwiSXqGDjlnh X-IronPort-AV: E=Sophos;i="5.87,254,1631606400"; d="scan'208";a="68752161" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 21 Nov 2021 23:28:36 -0800 IronPort-SDR: WCoduXn6zTlek3KbCvs0LGFfxgb+cY9b3pIUXYvXnjK6E0WFH40lIO+UHCpH4k3IbLNynOlLWf sHxNLcb0DlyfzjbOO7dIrKEJqy98lnTGjaVdUBugZJj1zd0qBQI7ERP1Ll1DbRUU/j0uG0d4kU hEVirgMmylKBIrdSovJVJeLep88d3GXJUwmXoN8/fjy2T2GFwOd8YndKWuYqRfwMWQVKzElQJX 674UnA6OspN+6xsOy7TIgO1OEoKvj53rWRssQX3rtahL4gwx/iqor2hZOXce1/ugodcblTXLCX jaY= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH 4/4] meta-isar: u-boot: Update to 2021.10 Date: Mon, 22 Nov 2021 12:58:05 +0530 Message-ID: <20211122072805.2123748-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211122072805.2123748-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211122072805.2123748-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Update to the latest u-boot. Signed-off-by: Vijai Kumar K --- ...y-add-property-no-map-to-created-res.patch | 151 ------------------ ...rty-no-map-to-secure-reserved-memory.patch | 33 ---- ...{u-boot-2020.10.inc => u-boot-2021.10.inc} | 2 +- ...0.10.bb => u-boot-de0-nano-soc_2021.10.bb} | 0 .../u-boot/u-boot-stm32mp15x_2020.10.bb | 10 -- .../u-boot/u-boot-stm32mp15x_2021.10.bb | 6 + 6 files changed, 7 insertions(+), 195 deletions(-) delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch delete mode 100644 meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch rename meta-isar/recipes-bsp/u-boot/{u-boot-2020.10.inc => u-boot-2021.10.inc} (72%) rename meta-isar/recipes-bsp/u-boot/{u-boot-de0-nano-soc_2020.10.bb => u-boot-de0-nano-soc_2021.10.bb} (100%) delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb 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 deleted file mode 100644 index 8a32fc1..0000000 --- a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch +++ /dev/null @@ -1,151 +0,0 @@ -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 deleted file mode 100644 index 6a39968..0000000 --- a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch +++ /dev/null @@ -1,33 +0,0 @@ -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-2020.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc similarity index 72% rename from meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc rename to meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc index 604776a..f3f822a 100644 --- a/meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc @@ -8,6 +8,6 @@ require recipes-bsp/u-boot/u-boot-custom.inc SRC_URI += " \ https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ " -SRC_URI[sha256sum] = "0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622" +SRC_URI[sha256sum] = "cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4" S = "${WORKDIR}/u-boot-${PV}" diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb similarity index 100% rename from meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb rename to meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb 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 deleted file mode 100644 index 39fceb2..0000000 --- a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) Siemens AG, 2020 -# -# 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" diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb new file mode 100644 index 0000000..6d95643 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb @@ -0,0 +1,6 @@ +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +require u-boot-${PV}.inc