From patchwork Sat Nov 6 02:12:02 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: 1012 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Sat, 06 Nov 2021 13:12:33 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f191.google.com (mail-qt1-f191.google.com [209.85.160.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1A6CCVP1028337 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 6 Nov 2021 13:12:32 +0100 Received: by mail-qt1-f191.google.com with SMTP id s33-20020a05622a1aa100b002acad90320fsf8062417qtc.11 for ; Sat, 06 Nov 2021 05:12:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1636200746; cv=pass; d=google.com; s=arc-20160816; b=zcrKEJwHNIzeDod0A9q+1uAN3uu5nnjpjthVIw9T841ux2vuNUvEL9lnOIJ9XM80yA YLpfwTk/KsIWlYD0YWuo56kMudklJ2NBV1ZphnOtzajFQIg5n6jFkPoS6n05APT5uajF 55WPCIFaqZ9SbmPFQesLYV8spwmSFZsN4YA9iTNAOpy3plzgy+40b5vp3S3eIsNSYASU fcAkgjMVkqDZqfjrbbZAHe3mYAI+hkOjKyYV5d+QAzD5aTvjoggQwu2H03fMAKZ3sYUW EVxGz/UtvdXrYUM2/nA7eVGMwkx502u8F+Hd2WDoD1mZvWJENerwjC78jubEq0tPvR0A AHzg== 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=kKp841BnR5TahiqdgihATP/25laVxvV51THLCaKjpgM=; b=M/7WiQ+BJk5ujtn3SoI0bOAIHb6HkiuWKeB4hTb2FeTrP4lrKAU4OZ2i0uPBMPkKpc dkDCyv29hbLXXiXTtowMyswobPN4BWcV3Q9vjC7DyfrcpeFZjHg0NqyXdsHwXnsxIzmK 4VfD+Qzi9gjXyb/7whsSZjuPfddCp/GvdF/h2esh6Xtn47qmI0iTpbWmpH34J3ecq5gC Wq6ExM6C98cOPVAwfq5nHrMF9OpviDOnjg0E5o7ROxur4jjunLpNgIjC/lwgZ4uPUrEq ejbFI5iCjw6gDFRHJaGtPWEBXyAHhztFBDQkRAZF97zGxo7ahmy91rQd/J++a8le7HPY vUxg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 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=kKp841BnR5TahiqdgihATP/25laVxvV51THLCaKjpgM=; b=hccwRzP1CgfCqxEB2hM+diPe7YuZS3nU9J2OVanPDhjrV/3hVluqnZr1nvNoaFBKxR GH5YRAaH7mIXpCVuFEe2rf3VUzW/gbiMa//6zsp7sjjnfTZ/z2/N+3tiIHb1D8j6UW6z VoKLR3QbXHWm9+Q7p3Fcol6Cr+7yWO47WWHSnAcVE3fse6K8OBe4U3A67g7eAxjzXgqL 2wCiB0AemO0LLpIFP0mc+HmKQwkIQG+isqh30WpeV1J27Rpa+PizpXyTGucmVOLNDSJr o3TXPW5Yu+rOpR+81l7EvrbusXRPxyif/MPDFzTRcBIKLvMmeMzCofizc8ygKATSLLRK XFvA== 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=kKp841BnR5TahiqdgihATP/25laVxvV51THLCaKjpgM=; b=DV5o9qJYOgxVPGUMrB9FCNyNtNmxn+9sabMiuMQGnoCUWausK4RYjY44etZ1+OfUN8 b+ZgrkBRNM95akBqfHV2K5xe5f8oL4wOZRec3bnCIaJHWlkzsjt8e3QACtv9zmLf8ZnG luOmK90ltzInqXWnpY9xIDd1lQdsR1QzasZuvHInDTYxssWxdiFp4aCViDeWcPgY7KOx xPctCsXC9QZssrx5IwuvoHNUZ3RCRleWdNvNet0DZIEh2SEvAUKB6YapvZqv6965BWMP OL9MEZeJbwDp2L2dWvqYvurSY17+A/uFYcUtgHXIdyU3YNIgUWfpe+9ZPtkpm4aAk5ac +rOQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530VnuhJCT1msgOEXl6qC8OgmLH9Em1Z1VNV6o/8LzBaI/IdxSO5 fMUJ57wrwqLd6UheXifv31s= X-Google-Smtp-Source: ABdhPJy0cmEXuiGEZQpdqvCJYKD8Xkaqvpciv12ER9rb77rOKZ+glPa+5TvMndUrC+5bvUaR5UIpTw== X-Received: by 2002:ae9:ed50:: with SMTP id c77mr17149790qkg.187.1636200745884; Sat, 06 Nov 2021 05:12:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:1e13:: with SMTP id n19ls6706660qtl.10.gmail; Sat, 06 Nov 2021 05:12:25 -0700 (PDT) X-Received: by 2002:a05:622a:11d1:: with SMTP id n17mr52691117qtk.357.1636200745307; Sat, 06 Nov 2021 05:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636200745; cv=none; d=google.com; s=arc-20160816; b=N74x2kI4gbINp2PYFIRpjpiFGwwh8NSbsjGfZEBbfPoaacu9hAvlx53aqWvjhXgiel 7oYFB7RqyUT6gDK68FHJwelD/+907jT/Qg/fRH70lWyZkJ7M18QLwDcMwh2rVeEYNAOD T2PpdsxOT4m446L+0+soOi9+MHKemyw2U6/lQAgeybzMuzVpPs7Y/HzXxpolN5c2uUm6 JledF5DHr4xm70423lIxLanToJOVsYXGV8xIhRaWdcjgPXXa1JCR4+uGIWHMjn6rnw9e rYYZrNnxME78ZPrK36a5rMIQvvnNK57Shn+pGKco1vy2F6/Fs8WyIN5d+3KIGQJXqP8R 4vMw== 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=r35HCu+NLpF+OSuLvkH9DI3dd5/7UQ27gGJBjX+lLgQ=; b=aXbFpftVLXg4ZMMJQs32S2ookpX5kThGyGErFIQBpykN2lsno/fUDpLPuJKoUDT6Pl ItAVKJ7g2nfC5pAcGyscRP1FqxAehbOO14tCfA2qTM9lQgNpis0ZuLVs2ZwmwzDZYlMw x2be14eyW+UqouhKrmtYQ4zhf6v3lx0a5eFFHzeu2XVgL8FNOzUteACyh2sEb7owVcYi yhYvmCbGtMJm3FOPxojaejNqqJn6lFm5IueR1Qh0r/9WPZRa+N3rZAgPLKJqspfN64Ie Ko9akNGImpQYdsEgpXtUeWT7AlX5xWIh++YvReyIu35z8at5wNSQQUd1pWvkB5lYCnqE 1JLg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 12si302969qtu.0.2021.11.06.05.12.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Nov 2021 05:12:25 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: 4WWmDfEKCru5ELhiYOI9NuCjkPMBguxUy/LKVLSYmWyqQhWn04Tc7S+gWZdvXO+PXqOXrogHuw E4saZbO2j83y2H0Jygg6f2xHfcvn5OO8/fe17PTI/nCTV+NTyV866eBDcTIYe6KtLcc/NOq2jk Hv4S/xSAwetwOI2NoPwMLzPJi8UJ8NCfnSKlfto+Kpu/AGkeIw1wfFTckvXJsvohmz/Ex6AEaC RAdtnsZHv5th13q6ptVe2eLsfi4y3ZQCnTiix+N542CoAN785v6GvplZ1U4rGTKPcyn2yT27BD dsztce4bPtEGqdznTUY8oDCc X-IronPort-AV: E=Sophos;i="5.87,214,1631606400"; d="scan'208";a="70617877" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 06 Nov 2021 04:12:25 -0800 IronPort-SDR: Q8ZQ3qjExHdVeKsbnd9cv+b49yJW63VPqdiJDPtDO7o3QK4UPW9f2iD44OVhS356IYRPTwu3yq I1MwwB8mP3vqpOwmIDcN4Mz6MeTysDoyj7oKJGBmNd1wzpr+BVD6M4BCrbWYIbD8qtWzmc6Rxd NPLCX2R3GT+n9A0+i1kMtKm9jSsRPgh9JLvylWDB8bO5h0Zoo/mLxoIPqA7kECzF9jMHSyUItE UmChWwq/r4ZTX/HKHH8ySv1j5iRi+ToxQZ8+v/Il+vW43/+v0fSjjVshbqZraLZcuC2oypn46u fOI= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v3 1/2] meta-isar: u-boot: Update to 2021.10 Date: Sat, 6 Nov 2021 17:42:02 +0530 Message-ID: <20211106121203.3210294-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211105061521.2142204-2-Vijaikumar_Kanagarajan@mentor.com> References: <20211105061521.2142204-2-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-07.mgc.mentorg.com (147.34.90.207) 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.129.153 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.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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. Newer versions of u-boot require libssl-dev:native for compilation. It also needs libssl-dev of the host architecture for cross compilation of tools. Signed-off-by: Vijai Kumar K --- Hi, I am not sure why we are not conditionally compiling u-boot tools based on U_BOOT_TOOLS_PACKAGE. We build tools every time but only package them once the above variable is set. I have left it untouched. When we finally do, we should check if U_BOOT_TOOLS_PACKAGE is set along with ISAR_CROSS_COMPILE. I could send a patch if we agree that the tools should only be compiled when U_BOOT_TOOLS_PACKAGE is set. Thanks, 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} | 5 +- ...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, 10 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} (50%) 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 50% 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..158c297 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 @@ -5,9 +5,12 @@ require recipes-bsp/u-boot/u-boot-custom.inc +DEBIAN_BUILD_DEPENDS += ", libssl-dev:native" +DEBIAN_BUILD_DEPENDS += "${@', libssl-dev' if d.getVar('ISAR_CROSS_COMPILE') == '1' else ''}" + 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 From patchwork Sat Nov 6 02:12:03 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: 1013 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Sat, 06 Nov 2021 13:12:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f188.google.com (mail-qt1-f188.google.com [209.85.160.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1A6CCZXT028340 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 6 Nov 2021 13:12:35 +0100 Received: by mail-qt1-f188.google.com with SMTP id o14-20020a05622a138e00b002a79da5b350sf8437824qtk.15 for ; Sat, 06 Nov 2021 05:12:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1636200749; cv=pass; d=google.com; s=arc-20160816; b=ap8agzQxG/0YvTJ1Bv4NVVVE4UxyF9ZNRcOZBLsGzjcjceL62nwiJD5UaaPlXrVXVB i+F3xwbvWo/z9cGp1bxLKCYdT+l5XjHMsXPurk/jA6Q2Nubjtxev6QyBiMXR2DQqzDbl zV9vN1RqkzwLQZAxq9YZIjjmI3M6Yu1zg6Rc1pLO4Di3u23icyoRk/OSfoRs2VPZvThh Uo3IsDifvX0PnP8tkmAbFAaVHCsf2r7c8ngF43dShp9wPU39Jcsag0CzKZP7RQ/GjpUR BSTKkOgnX+nahi0gZNEo67MswVLepgPH56/qBBVYxx1OnTeQOC0/kYD15Ymmp7GNduuL gRWw== 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=cNXWEDbCA+M9nHX8u0ag5akYMsfXYK7xtaapM9uPj5k=; b=dkwX4K8THBi9KKNeTSf7dHDIPgmVB9LT4sqZNqTiPkzSCcgMkv3gRsg4K10j4jk+kz IrBWOhNS861Rf9njL2YQHfpgmQQdFJgFvqJ7BDapiLhJrQ6OMv+jkyITtWtoGJZLj/RB 9pHKRmbLDYiDpzZ9jE8VQj9urffp1yaYqqKRL+frdtG2+h60XZLHqpbk1bPOQCQClnrD bLXl2GRh5BTv/etW1FytYtWWmCWOh03SGfNhYrdHr/KdnMCIgfq1HtcGvlRxLyZESumO kTczKJsgD0XFduoZnjiwixlJRQbCuyVfmMTOWKoinlgkB/HEuV7ZWZE3OPUwZKl2CWxN 5vZw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 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=cNXWEDbCA+M9nHX8u0ag5akYMsfXYK7xtaapM9uPj5k=; b=mrecBcHWHs/TN3wzVBrssI3RNho0QKNqEt5U7tVg5sHhF0LrOQzGR3eibwjbS0ouIo vCPyveimmmdu2spXtr8B/4lsqtgih9A/pPUoTTtR1rVbjGApW7wa5tOqF7x9yWluC/yg pl13CE3XR1qxaFPgyW3al5d1MQOMDZRAj6PkOXbclnCyWcxIQs/JmGfx5y9Uuu3fvW2L eBGUaKQM4dn/AZ1k0bQ8RAC0KMksZBQs7BruF5Lv4bp+Aht9M+DpxDbQgMF0bbYN0AaU +UKYSkbXwjC8kDALcr6Zj0JXzQ5afkif+sO16tdnhTEfZJh/zoFXrjFkxcdwVN0nFa14 sFCA== 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=cNXWEDbCA+M9nHX8u0ag5akYMsfXYK7xtaapM9uPj5k=; b=gMpPD5VvqAlgF43r22DiwfGK0A0/bN1FZuQ7CCRaWDjVqc1YW4SbyA52WQNhDw+IzF ObPFA3+/etWzFktGeUreck6eOlUwdvikZ9g7KNlfP+ywUvim6o/Qg9RUGgl5FTnBOazs mugn9WEJeRnujWM7KKzeFjRQL71rbbbSh6sD9EiwgWB8oJIlKrHm4tatqUMHk6ietyId TkAfXgnNVlJTIQ1oeIm9scPuSoZzgl4siFEPa1amNgwLgFlvdloldk5BEcTRy4Je5+nA 5y3VNIOodMSPkWyVenqWrR3SUpYGyf7LwDtdSsexIPsQBDVRohbnc/rUje6Vp3lPFSAx Or/g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Ct+M9SKxqsn3r8I7ggmBIOVLvAI34Y1p52UMD9SIH125PAPCx 0CyBgEpZEk8/jCKYgg+9Mg0= X-Google-Smtp-Source: ABdhPJxLDGpe/GNsuMcr9O61qviiGytZYCHLr5JkWd74By9iqN/MX8OaepORQ5cl/mQ4nd3lm/pbcA== X-Received: by 2002:a37:4050:: with SMTP id n77mr51248903qka.267.1636200749822; Sat, 06 Nov 2021 05:12:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:13cf:: with SMTP id p15ls6719926qtk.4.gmail; Sat, 06 Nov 2021 05:12:29 -0700 (PDT) X-Received: by 2002:a05:622a:250:: with SMTP id c16mr23056311qtx.283.1636200749393; Sat, 06 Nov 2021 05:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636200749; cv=none; d=google.com; s=arc-20160816; b=fYy9kuoFp5et+y0RMq1i6df7X/UZmWtNVJCskRT6qUB5oRa1bcIKhoC7GATDbSh8a8 5YSZeMsKMu2HyCp4sFhhhHcp4I7Hmz26BNAKOFsPsbOelu7QplKRbUfpRJinqo/lZnH+ 2Ak5oLb6Ak9YMi4qx2yTUW9BYY57XT8s7h/cc8Cu3jLHrXiNNTny94/4WDR9JPY4osYK qyiOAm1eZgJ//+fme9w9UEmiOKbRq77dlIWjnWnA5gAqmPpUawt87u/tK2LpHrHMbbJj YzKcBz4885vfpVU8/HMb6hw4NtYQmutonClLhDGaw+SdCDwEdaDYnnkLp3tQMn8hY4r9 ebgQ== 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=biV+kUFtazP8N+zXhvHL5B66+nq03OOuDUw6Uwobl/M=; b=ZOPvc4oVOii3Nyu8tah8bAn0UHjDT8eNrXq8OADEFiy7l5/dp4aIzbJMle/4x8tuQd 2DUS12jq+4KUaPzCrU2zUwyTpujztwZqUsvtDadIjerrl8NJyrT4vZfRKk0WMoZci4Jf O/gx87ITPPosEbk1y+3KpcuSF9+VX3RkhnUjpYrDRlGfuLw03haozdWBx3xipy9FN1NV 44Pwp3Drsq6639ODuL/8G/3HhPyPJjvUW9ai3sQ8uodFvxvpkX0wZoRFvsbvshczLlu0 LCdZfeHye2BcaP5T9/8jtLregpa5+5T70GYdgu+ZYPVfXzg5Ob23HSbFW4LQgGLRoShK g7wA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 12si302969qtu.0.2021.11.06.05.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Nov 2021 05:12:29 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: w2Aelh9/WzmHxCn65u5N26ViCtgkV6AsibL5StBvxHzx3GVNgOOWfsMyKB6U6x1VZ7emBOs1oT AWE5Y1D1VcjLacmTELDhSKZ5HG8jbg2/4r+DYl00jBSnRfDPetPzOamzFS+T/L1dXpIUQjNPMt WiLp0HaUONmYd8iWpPdfdEf9YKfvCEy0T4JySdpLHoA63j9jJWpEPQbWhifiUGemND4XOXr9rg I5QWjajKm4lmyjN8a1ev1J9IB77Do2uTtEcTq/JVu7gjc5FoEriNI6fpGfV82UP3ax4m8Yszo1 Ef1inMUs1lfC4MhSNwuYBN1y X-IronPort-AV: E=Sophos;i="5.87,214,1631606400"; d="scan'208";a="70617878" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 06 Nov 2021 04:12:30 -0800 IronPort-SDR: vRMR1gFWLZlnnM9Wz1XqPXMpY1R9SghCcFipwM2/bGSODPolm4+VwI/sKSAu/EwG5IapHRMbsx vKoJAnEd8wG5s6Spc+EPNLuHjXc/hdi7/PzZUq9EKTJ61txicetwTc+hXxsWrydAw/HShMUoFB /J4cjW0zitpOtkyoInKaXJ4RsaGDtoyuy7MBcdGwxtODTBYe+qE8g6uzWx7vHi9mMRkyQ8loNw MdTDbU+Izu5HzAWEzqJ/hNUJh+yZ4oP231qcLypmtlauD95lbiRf50AHVuIlUvFSvOQxbDStLU TeE= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v3 2/2] u-boot: Move libssl-dev dependency to u-boot-custom Date: Sat, 6 Nov 2021 17:42:03 +0530 Message-ID: <20211106121203.3210294-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211106121203.3210294-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211105061521.2142204-2-Vijaikumar_Kanagarajan@mentor.com> <20211106121203.3210294-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-07.mgc.mentorg.com (147.34.90.207) 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.129.153 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 Move the libssl-dependency to u-boot-custom.inc. Signed-off-by: Vijai Kumar K --- meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc | 3 --- meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc index 158c297..f3f822a 100644 --- a/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc @@ -5,9 +5,6 @@ require recipes-bsp/u-boot/u-boot-custom.inc -DEBIAN_BUILD_DEPENDS += ", libssl-dev:native" -DEBIAN_BUILD_DEPENDS += "${@', libssl-dev' if d.getVar('ISAR_CROSS_COMPILE') == '1' else ''}" - SRC_URI += " \ https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ " diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 9984d8c..57d4f36 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -24,7 +24,9 @@ python() { d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS')) } -DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" +DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git, libssl-dev:native" +DEBIAN_BUILD_DEPENDS += "${@', libssl-dev' if d.getVar('ISAR_CROSS_COMPILE') == '1' else ''}" + TEMPLATE_FILES = "debian/control.tmpl" TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS"