From patchwork Mon Nov 22 05:26:04 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: 1102 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 16:26:35 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1AMFQY6n005141 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 16:26:34 +0100 Received: by mail-lf1-f64.google.com with SMTP id z1-20020a056512308100b003ff78e6402bsf12496924lfd.4 for ; Mon, 22 Nov 2021 07:26:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1637594789; cv=pass; d=google.com; s=arc-20160816; b=n97eTZTjxyeCMqg26n7sVNa2Berl9lvwId9HCr2Dl67hpzylnqVf7EixLUydMHN8KD IHblzCwrnnpU5oSZz5M8pmLu7Ui9999kIkRCHlI30rFLYXTiVxxoqwp49ZSaVsRZHlto urAxpkcbWv2pxPUpYHI+d+mcXVjwEyo2aoSQftaqWJSSWqggeRm8LDfBF8KT1c9kIP5Y egcJgEbtbM8k1jhSGL7EfoY3jT+bds55Fq8aN+DRF2MFwFDYDzVr1YM25Cty41rXoU7m 3wqnEP1yJZpsRuDxZWlEDqNSh7hKblvG+B9Mlyfne7qUWzG+XMlsB3cSjwJUOnbSR3Fn rZxQ== 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=WvzZetq8cvArfoSxvCqMpIPYBCev2wH7Vg+NkY+CjOo=; b=UCUYBtYsTeKL5+sIUFSGScdUHwC4yEyjbnT1Hjqjvro/B1PTi/BFWNkeJWDwiWD+c0 a82/X60JOSjhbKp8twEib00JIGJ3zfWEXgQY3YRZIl1aemJeZWvcpq1Sk6yQx3wFpfuG i8XqbCRs/3mUr4m7fT5pOCzllOnZLUt460g2+f8kcdB7w2IPK0FVbKQIBcrCvkZqR0vq HC2Zvgkmx3z5B+ZHxxPBV3zm//dEc9ZOqumnNGjQoh+NUWxNpIxObYARWMg7BPhQ4iJm 3Vwtv7NZX9omHaty3G0fK/plvaCzIDeTgWA/+rBNbxzLwjQVJhZNGnKjN1tBmZP0yeam EVhg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=WvzZetq8cvArfoSxvCqMpIPYBCev2wH7Vg+NkY+CjOo=; b=tQpfpo1l+FItUNl8nJRFZ4FbSfAOm5uJiDLnTV9RHCAmR4szOq0bgpOzGONYaHCt21 MyDYorTVLJzpjj8PaOJumbQ6mYgdmNIz7BRlOxo4rr2FOvZ7VkfX3qphU+qj9oujIUka efGyieitYIi6Er0LWnDVclWZI+a0AUnaR6zeo6O/RuBYnHcc+VKtp13F+UlJ9CNaIB+o MWtXVwjge8Cqt++snZOqXPZypWnB1L5HG+u896pph0NlQ5gmt2lgSBCQxzzjqbfoMqbx ZLWae/E9kjDxv4cDJWEGvB5WueJ16AoARjeSlo+e2MeKPMQ+P8vI/4N9/NQ6TqCosdee dVQw== 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=WvzZetq8cvArfoSxvCqMpIPYBCev2wH7Vg+NkY+CjOo=; b=DIyzwJx5D8L2Fsq6mWpiU0sBjDCEJ+DYkD0cRAiuMhRo4QAh8mOTv9qA+7rKUcwarZ QR0KFdKxTVRS5wzbkRqPZ94OTHPbZRs77AamMQvPHK8tXhMLN7eLIcU5U0Vk5UnMMo2z PD3/kVJQ/flDZW1cLjKiL8FsTmmjVtU+TjJvkKs8hR8C1gUmlp6SfauWJjn0RqYAD5EI SekTqQ8B3R0D5ZXK0eXKFxvFYSG8K4MZUSjjcXzYpnsCeeb7LXe00zZnsUhu7K8vCbK8 y0STwvUsursaqKUMcIOmeb8ai2G9l1n5xy4NQ8aORfa9t5FnnXE0DlpAS5GJul4W7y5d yktQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5321Jjz38LrF8wpjSXMML1y96AVFbLur7nijgfcqZhwSCDSef3fF TiI+oNPtUM8znGfNj2CegSw= X-Google-Smtp-Source: ABdhPJykbwavTHOWGSwaEEZKV0FAzwqIPvv/xDmRrsmUIq6etJ4UGO/Zy9m5E1PQYje4D3ly5V1VMQ== X-Received: by 2002:a2e:8554:: with SMTP id u20mr53286585ljj.70.1637594789270; Mon, 22 Nov 2021 07:26:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls821601lfv.1.gmail; Mon, 22 Nov 2021 07:26:28 -0800 (PST) X-Received: by 2002:ac2:5d2a:: with SMTP id i10mr55778043lfb.207.1637594788081; Mon, 22 Nov 2021 07:26:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637594788; cv=none; d=google.com; s=arc-20160816; b=JYvL13+/G4WIWuDBz8GWqQVDKX8tSMe1axHl0i/WmPZj2LGwcdun3QudRZr8rTM10q U4FDfs93a0ijfgfwgqrSLJunamsYLqf+PIrBHrJDyAku0uB3S/kCJVXUW6paecofmQsw 3HlcZMqqdkaw7xlMuzcIkfIz3NzydGGQHRl9uRz9A/WFouKzNyfQWUiJMAUMadpc1bgD kBYe3la9B00QJXKS68YZa+FcvhsNgWhVsWnD4bbrWOgmbO+XdVUlxsMLMuwLPFey7PjW uxpZeQLECWh/705MSN+iOvPc+WGTyN4tKzQxnV5EbojEvlV3gszUMXQc93FumPAlzb7z oa6g== 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=b39mV7N6ct+ti2edmhH/pohiKSyvMHt6dafFtioV6+U=; b=IjO463QkHc4DFjvb5R+sjpweyAXtZxllHzD+GOWk0I6rE92AixkdsTz+zGX9/cXkKA ygqYF/fxrMUvecHeyhhHLxsO7+ZKo+EFQRvhzVSGvQb0y1/U44z3g9FpehdDeU35kZz3 dmcNljIOKMO8esxsYzLjbJj7zq4v1O/gSIVBocPV15axjMOe1OL9XuMeDiVZeuv4j6wa +xnmmux8XLVrxFMPdlsOmcaxeVSO7uWTqE+eGHNggodu1Unhz4/Vbpwq/DKL/8f9mj7/ dR4iVd39wxVY8y1bublrIsn9Z06MOA9ggZ5aoJnYgN+Am3Gyc/EtcYWxzLp9a+YJ8nDw +fGA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id b29si607674ljf.6.2021.11.22.07.26.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 07:26:28 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: WTWOfjEinefIfIQ2RXbxqvWww+od5XsMSNFrQJqrEf7DDbBuHQUGpjT/t0ub5oYl45sDceaHb6 wdrqiphpNV9jEDNnEj3kALUwDNMSgappLYSH6dE70ilEfQlREc/PZVPL3+krDwxjWSvlgFQ7nG vR+0TYEhGNy7eZ5iEiIotJ+kIyB1OEz2VxX+p8g1qE9KqBLxHail8UbR7ymhFCRZezsUK3dIhc FpOa4LGMuDoAguEFFtjKC4qAAJZrYHHEPOE72/zNr6g5c35Hz2Aai0EZ6q5WzyvN3gjbNsGIio pG/VHcIKNRMNFrGR5oYDCHLi X-IronPort-AV: E=Sophos;i="5.87,255,1631606400"; d="scan'208";a="68789234" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 22 Nov 2021 07:26:26 -0800 IronPort-SDR: p79fU6lF0+9lM2RcsDVYa9uWU5l5MxzaYSf1P9PrJmvl53kF2kc00Rc73NHUULeIJf0dKfyd8/ KO+EMJB9Kx7tenJi+b2V6/ywIR7xoys68RmI9tU5f+bMPPbQAPRECTcBZqjGnjyzGH7aXb48YL IWjZ37rSkP+w6edFwcUwT9IQuD00TDC03ijEdkncwdykMhYGIPh1VU4VWDVJOPpuYJ2U2AiLH4 qSr6I1jN8wD3slMykRFoDZ7hRThsmR0/8slbgnoo9pQVSacO9yA5YMz0oZmysmehbL0SPV6ySH clA= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v2 1/4] u-boot: Switch to use DEB_BUILD_PROFILES Date: Mon, 22 Nov 2021 20:56:04 +0530 Message-ID: <20211122152607.2125422-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211122152607.2125422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211122152607.2125422-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.137.252 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 Use DEB_BUILD_PROFILES to select packages to build. This patch drops the U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE variables and introduces U_BOOT_BUILD_PROFILES through which we can enable particular packages like u-boot-tools, u-boot-dev and u-boot-config. Also, provide backward compatibility with U_BOOT_*_PACKAGES variable and prompt a deprecation warning to user. Signed-off-by: Vijai Kumar K --- RECIPE-API-CHANGELOG.md | 12 +++++ .../u-boot/files/debian/control.tmpl | 13 +++++ meta/recipes-bsp/u-boot/files/debian/rules | 9 +++- meta/recipes-bsp/u-boot/u-boot-custom.inc | 52 ++++++++++--------- 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 7312d4d..3b926bd 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -301,3 +301,15 @@ Kernel update with "apt-get" will not work since bootloader configuration will not be updated. It used to "kind of work" for grub and efi, that hack is gone. When using the plugins it is advised to name the partition "/boot" and to exclude boot from the follwing rootfs to not waste space. + +### Deprecate U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE + +Use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE and U_BOOT_CONFIG_PACKAGE + +U_BOOT_TOOLS_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES += "tools" +U_BOOT_CONFIG_PACKAGE = "1" is achieved by U_BOOT_BUILD_PROFILES += "config" + +u-boot-${MACHINE}-dev package build can also be controlled now. Enabled by default +in u-boot-custom.inc. To remove use the below code in your recipe. + +U_BOOT_BUILD_PROFILES_remove = "dev" diff --git a/meta/recipes-bsp/u-boot/files/debian/control.tmpl b/meta/recipes-bsp/u-boot/files/debian/control.tmpl index 9379be7..7ac11ad 100644 --- a/meta/recipes-bsp/u-boot/files/debian/control.tmpl +++ b/meta/recipes-bsp/u-boot/files/debian/control.tmpl @@ -11,4 +11,17 @@ Description: ${DESCRIPTION}, bootloader binaries Package: u-boot-${MACHINE}-dev Architecture: ${DISTRO_ARCH} +Build-Profiles: Description: ${DESCRIPTION}, bootloader libraries + +Package: u-boot-tools +Architecture: linux-any +Build-Profiles: +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ${DESCRIPTION}, companion tools + +Package: u-boot-${MACHINE}-config +Build-Profiles: +Provides: u-boot-config +Architecture: ${DISTRO_ARCH} +Description: ${DESCRIPTION}, environment configuration diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules index 3d66762..121b00e 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules +++ b/meta/recipes-bsp/u-boot/files/debian/rules @@ -20,10 +20,17 @@ override_dh_auto_build: else \ ./scripts/get_default_envs.sh >u-boot-initial-env; \ fi - $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES))) + $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 envtools +endif +ifneq (,$(filter tools,$(DEB_BUILD_PROFILES))) + $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only +endif override_dh_auto_install: +ifneq (,$(filter dev,$(DEB_BUILD_PROFILES))) mv tools/env/lib.a tools/env/libubootenv.a +endif override_dh_auto_test: diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 9984d8c..5198809 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -9,10 +9,13 @@ FILESEXTRAPATHS_prepend := "${FILE_DIRNAME}/files:" DESCRIPTION ?= "Custom U-Boot" -PROVIDES += "u-boot-${MACHINE} u-boot-${MACHINE}-dev" -PROVIDES += "${@'u-boot-tools' if d.getVar('U_BOOT_TOOLS_PACKAGE') == '1' else ''}" +PROVIDES += "u-boot-${MACHINE}" +PROVIDES += "${@'u-boot-tools' \ + if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}" PROVIDES += "${@('u-boot-config u-boot-' + d.getVar('MACHINE') + '-config') \ - if d.getVar('U_BOOT_CONFIG_PACKAGE') == '1' else ''}" + if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 1, 0, d) else ''}" +PROVIDES += "${@('u-boot-' + d.getVar('MACHINE') + '-dev') \ + if bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 1, 0, d) else ''}" inherit dpkg @@ -22,6 +25,20 @@ python() { if d.getVar('BUILD_DEPENDS'): bb.warn("u-boot-custom: Deprecated use of BUILD_DEPENDS, please switch to DEBIAN_BUILD_DEPENDS") d.setVar('DEBIAN_BUILD_DEPENDS', d.getVar('BUILD_DEPENDS')) + + if d.getVar('U_BOOT_TOOLS_PACKAGE') is not None: + bb.warn("u-boot-custom: Deprecated use of U_BOOT_TOOLS_PACKAGE, please switch to U_BOOT_BUILD_PROFILES") + if d.getVar('U_BOOT_TOOLS_PACKAGE') == "1": + d.appendVar('U_BOOT_BUILD_PROFILES', " tools") + else: + d.setVar('U_BOOT_BUILD_PROFILES_remove', "tools") + + if d.getVar('U_BOOT_CONFIG_PACKAGE') is not None: + bb.warn("u-boot-custom: Deprecated use of U_BOOT_CONFIG_PACKAGE, please switch to U_BOOT_BUILD_PROFILES") + if d.getVar('U_BOOT_CONFIG_PACKAGE') == "1": + d.appendVar('U_BOOT_BUILD_PROFILES', " config") + else: + d.setVar('U_BOOT_BUILD_PROFILES_remove', "config") } DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" @@ -29,8 +46,8 @@ DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" TEMPLATE_FILES = "debian/control.tmpl" TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" -U_BOOT_TOOLS_PACKAGE ?= "0" -U_BOOT_CONFIG_PACKAGE ?= "0" + +U_BOOT_BUILD_PROFILES ?= "dev" do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ @@ -40,31 +57,15 @@ do_prepare_build() { echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \ ${S}/debian/u-boot-${MACHINE}.install - echo "tools/env/libubootenv.a usr/lib" > \ - ${S}/debian/u-boot-${MACHINE}-dev.install - - if [ "${U_BOOT_TOOLS_PACKAGE}" = "1" ]; then - cat <>${S}/debian/control - -Package: u-boot-tools -Architecture: linux-any -Depends: \${shlibs:Depends}, \${misc:Depends} -Description: ${DESCRIPTION}, companion tools -EOF + if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'dev', 'yes', 'no', d)}" = "yes" ];then + echo "tools/env/libubootenv.a usr/lib" > \ + ${S}/debian/u-boot-${MACHINE}-dev.install fi - if [ "${U_BOOT_CONFIG_PACKAGE}" = "1" ]; then + if [ "${@bb.utils.contains('U_BOOT_BUILD_PROFILES', 'config', 'yes', 'no', d)}" = "yes" ];then cp ${WORKDIR}/fw_env.config ${S}/ || \ die "U_BOOT_CONFIG_PACKAGE requires a fw_env.config in SRC_URI" - cat <>${S}/debian/control - -Package: u-boot-${MACHINE}-config -Provides: u-boot-config -Architecture: ${DISTRO_ARCH} -Description: ${DESCRIPTION}, environment configuration -EOF - cat <>${S}/debian/u-boot-${MACHINE}-config.install u-boot-initial-env /etc fw_env.config /etc @@ -75,4 +76,5 @@ EOF dpkg_runbuild_prepend() { export U_BOOT_CONFIG="${U_BOOT_CONFIG}" export U_BOOT_BIN="${U_BOOT_BIN}" + export DEB_BUILD_PROFILES="${U_BOOT_BUILD_PROFILES}" } From patchwork Mon Nov 22 05:26: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: 1103 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 16:26:38 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1AMFQbG2005144 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 16:26:37 +0100 Received: by mail-lf1-f56.google.com with SMTP id s18-20020ac25c52000000b004016bab6a12sf12570754lfp.21 for ; Mon, 22 Nov 2021 07:26:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1637594792; cv=pass; d=google.com; s=arc-20160816; b=whswmvP+PGDyHYp7Ct5zz4V5b7HsFONLkh0sRoUszUiXI816fmQc21o/TKxTlS3mVj vrmCUeltQuoZLr4RbXHejO+Co+08PxYC8eckrvDufdF25oRKudzNhI9NG9YGxBKilFeP uB5/Utk3Gxnq36V0nJt5/hzGlEMPd2pdinLfA8vBi9l2hLjbKq0ybxaQgKoAMzQE/+lo rnAQl+xAWmuqrL6lG07W7A8l3r3HLGIUUHrIyjOATTIx2zE0r2oSQyVIwn/jNrcYvoDp uSABeLuZGfWX3oi2Z7uAKdLrOhdmvzTkrgwHd0EE095xfoNesl6CsmjF/Zyo+zK5xZG4 q6DA== 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=4cYY3yXJHhiElj/yha6/4vqM66630lXaqVy3EtU7+cg=; b=mDQsgcBT6W+lB6GCcLpS+TNUJAfFXitS+5w2Ii/gWtMKi5Uk1n3M8siBPWpdhL85ez qiMpLpM4EWMXTmn575Cpqf4XxcD7VHcEFIumfczL0gOKtxG1xE4MTUN3gK6Qxalxr3KV 5FLJ1JBHe1Xut1rql8Fa4Zxvr1nmpaNLb24GWOf4gTANz+J+KkPm/ItsrByDHBNTtYYo WOh5BoJO47dFuUIjYBhDzkLTdsVQ+fRrGwFjivbJ3AQIjwWy5uFzzoBMLUFd2v93aG8y FViWepRb7IdEYoe6Gc3yhjh54Mc9U7f09FOo+nw7irtx38FIlziHr6uNfE2bLfDq/KH2 mCZw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=4cYY3yXJHhiElj/yha6/4vqM66630lXaqVy3EtU7+cg=; b=azmPNigoBDnJJEOGq8/o3tRxDbl/dL5MAu6uaWgtRpGj5G0sUpRDKgzehi8Q5OjAdL sAq5CBTff2uD4CXxdArsSrcgfmyHI/n+Q8VNd1GohGchpCJtaq5yggXVEeryZ5YjxJY1 uzerXw87AMXs4itYaIGplYw4fw+O4/On8yRW2rJXXvYgI/m4EwnCAny+YVmPeQE74btz Dd3xPzK0nKZOViMPck2f+yiX33XJjLO9XjQa0fi5A5odsHn8obtCYBqm9uP0qqs2w8Wy Ns8wEhut7p6PzcU6LaMNxK3NYI/FN0IPfk00a7EF6NGe2lfylqiaLI9pM7AmH2Gs3t9f JSyQ== 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=4cYY3yXJHhiElj/yha6/4vqM66630lXaqVy3EtU7+cg=; b=w03GIliMDzKNg1QHU1DzuVD5GbcEfG8ZbHKxFnMRA94/9mr1ITdWHr+Ygx7HdUrx2k wL9xaqRh5bgIwL5MKWzdWqS8by7qheCE1QZxTDnOGlEdmPv2CfMDK0zyEaoKnxs7MPLu 1fs600iPaThDp1nWHTZ1iPagV7LiD2lBHaNoGPX8fxDiELghv4VaZmhBHomV2V0FmGZh ayaluwR35yCzcnwow9HFDn1gJ1zb4S7mBcqZMCL1CBHEBaSEIVOM+20yHFJi5HIqj8d1 lmWTXpUsh9x1g6CiKC/UNJNIM2OfgpvIcBPRXTS74QtUZk5MibUXx/DqXl4pu7N2TfGR MQdg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531IfsJXvh0MihlAklSvrB3yP4JVWK8MrwgsyYr8d1ECjV4ro5bL EkDaC/Iht3lTVe9Ou0bDtVk= X-Google-Smtp-Source: ABdhPJwRyAMENOLBYEFCzQEWOiCG7qZHvsfZGdDwCvgda1KwG7WDnNuovpJCvp1al9pZoFmQbAxMZw== X-Received: by 2002:a2e:9e4c:: with SMTP id g12mr53987261ljk.114.1637594792425; Mon, 22 Nov 2021 07:26:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls1078032ljp.8.gmail; Mon, 22 Nov 2021 07:26:31 -0800 (PST) X-Received: by 2002:a05:651c:c3:: with SMTP id 3mr52047303ljr.170.1637594791326; Mon, 22 Nov 2021 07:26:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637594791; cv=none; d=google.com; s=arc-20160816; b=k3SYmDNcxI7ACYb53fKXylNXi9469FysX4tAfb+nmG0jO83ysqZz3Rl4fo6x1VMISu dZgyillc63t6Vsx5gvPO8n3ke16nP2y6LgVIEJkXB9lXdlvoYbS1JIbh9ruRs2buxhv7 OR5CIGyRI6a97ZF91GmHGquFMcKD4l5CjElvclTqV/0uA/cGqbtOzfkW/wcn5mfRMl89 61LQ0NrKlupy8Mu0fYrmq9jv1vo4oQeiJZV4vO+JLzBDj5dcUSo/gW5P+Gw0Mwjvrsee GdK+ljcF4GaXy9wsBhe2rSwtuUlo5qeJOyjl1cp3gi7+UZKlnTEHWaMg+W0xdIFiu6YE lkOA== 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=aR+/FiwuHVX6C2nmBl21rCEOj6KgejTGpxxAsB4y6pc=; b=hUckaG6oJn2AS5K//B6l5hiSvCMKnj5nDIAIia1C2Sp2Kj/LpHGMwyEHihOYGuJZVy M40E0HLSLd7L65rF+CBTjCWS/dtCo8mwmZX23s5G6ociCbLlVBzJGMYnXw+LCP39d2nz J1T6GpPO+qJddA9KtYLknfjzlus/0PqKMQ5TB1jcDpJljXhA9PFjEHO3VtWYiBX6dH0H MoVJlGAJ5ksJDnFi8VbeAvLyh/Ii5WsyAZCKltrpzTA2XKgHMJpNpGckAS6WebhaSJLB gd7zvR5oSWKlXFVnFLU4ERFhzxgt/RJlEnj8PjvykRHwMGckQ/p6q3H0+w/7EXx2dJ2G Wexg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id b29si607674ljf.6.2021.11.22.07.26.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 07:26:31 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: oEujjGq3xpE5co3SCXemMDkT7yFFAQdHufrQ0+wG7WLrA/6kS5yjVg8hSrW8TxfeHYUD++RFWD rZnzY8fRdygRPv1T6fSzR3fJqnPUp0McxxuA4awEUda0x/lo762V8vro6vj1zAgnjHgJjVxMHc 1C0+M8FjzwztmgG9dwSVH23oF5eXpEr20Jso3yi0p6imR4XX6ov24ZDyKYDpeb8hPCy1wtIRwu AjvDVi4pK/YG++FfACPHOn47CjUBEuiwyEXRmMf8xEahNNB64ydfTt4+GjtlRPnh1wzwSBY02F 7P0CPa103h4BuDOsOQH8yhSx X-IronPort-AV: E=Sophos;i="5.87,255,1631606400"; d="scan'208";a="68789238" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 22 Nov 2021 07:26:30 -0800 IronPort-SDR: m0wWkhQ39kVglyQTFAGNGIcfODdq47e7ipH3kAaAui7icpWF83EPtyJID1OgshdBtz5rIKcXYv OPpqkfPyr/FDD2f+C7XwIrBfuSdEraGfYtqkFcFivs8oo99faUp/HWs73jAUbbrjF0LwNdzXdM MWrtl0/H4zAM+LrWgMs87EyKdUu1Zs2jJtOyGl9l0L+S4KD8zJ+Mh5gbYBOClv6DlDtkzuXHaI dfXCG9q71HkLn0Kgb6n0MByfq4awcIjDOiZpotOtkQiNu9CEjvMy+e6PEKI2KWP9WIt1W4Kl5p M10= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v2 2/4] meta-isar: u-boot: Migrate to U_BOOT_BUILD_PROFILES Date: Mon, 22 Nov 2021 20:56:05 +0530 Message-ID: <20211122152607.2125422-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211122152607.2125422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211122152607.2125422-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.137.252 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 Migrate u-boot recipe to use U_BOOT_BUILD_PROFILES instead of U_BOOT_TOOLS_PACKAGE variable Signed-off-by: Vijai Kumar K --- meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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_2020.10.bb index dcb76c5..640b7ea 100644 --- 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_2020.10.bb @@ -6,4 +6,4 @@ require u-boot-${PV}.inc # Just for testing purposes, distro package would be recent enough -U_BOOT_TOOLS_PACKAGE = "1" +U_BOOT_BUILD_PROFILES += "tools" From patchwork Mon Nov 22 05:26:06 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: 1104 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 16:26:41 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f56.google.com (mail-lf1-f56.google.com [209.85.167.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1AMFQe1e005176 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 16:26:40 +0100 Received: by mail-lf1-f56.google.com with SMTP id u20-20020a056512129400b0040373ffc60bsf12470599lfs.15 for ; Mon, 22 Nov 2021 07:26:40 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1637594795; cv=pass; d=google.com; s=arc-20160816; b=0z5IPUMQFrOGMgrRIOODPRo0d9yjMxknY/eG50ZcSnttBMvgF2lrxH1GxXdzXzQaP6 Zn29ssbI/RwlYPwvAYqjQ9JhAvgpxVS3MSYiwUQ9fFaejNcTyiGTxuadzCyEZxp4VIjk sMf9L/ros2AYi4QpsDvxtgoTB95d2fXa6BtKVkKox6/r38G0bDqVk3Ww760gN32Lax/8 7qkv2YB3DBaofz9ndETJ8muiLARjUlalFM2cu6P8Hfjpt3TWrCyYWehZYHXXO5Owjhh6 sMVuqGhwgwHLybGeRjaXyMIr7w7Bx/4n5pFGLbkOBaGqT6OH2D9IAXFiAWiNn8rbg4AM U6iA== 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=KMINqTQzEkCoEAN4PjMT0H+ytbRsyczzbQwGiDa3vJk=; b=dbhXDN0Xc6d+nUn+c8osvusdI4DLWqqgBtMlxu1kB2+VJ1Wn1MOjLdUA7mTgmQ2wDH /JsKOjzNnMfHNL4ua9yXmCL3c3ues7tUWp3xul0/Pbq68XxZROu00H3Z3YsQSre75F/r v7MzY41JlV8QPJnQtDo/BwhQg0sU/TS2MwIgm5UuSnl+vVI8jPU5vapoW3JllGjqcFjB uVgbyW2v1CeJ4T/OWz6D9HLFGiIRcl8nrVyBI8RyRzaH6v1d9gmnqkDKIhyj7UQqOYQD t3a+n/vrGRzAlbxSuXi5nwgtGA/y4jce9rYz9TajcR/yQ4a0vUB16lqdzcTowiyd+tGG IAgQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=KMINqTQzEkCoEAN4PjMT0H+ytbRsyczzbQwGiDa3vJk=; b=eEo11Nwxb+hXCd+K3iitiYsS05Ywi8ZDUcHALp/Cq4gHuSXKAj3Vhq+pqvg7C0WQZF bI7voNrXOdXryRBN/BBboCNfYetxWxUfiItEpu+MG8KbiBV5zfnBG7CriOU/46Pns9Wa Sszt3C+q4IfliFU67XQfrfz4Ps7tbprCNZqvhYtE19ZumMobL9aJnhUec7ZHu3Gh6aUY De0FJw8AShF53SmEj7qmdVKNh8/F2L4XST1w0lCmESIRlYnpcVpT8QHZEVXgbCkynLlg 2oXKpZbu5ovJfHhCW/Y7xwBorOGQxwwPbUr4foxoApNSM4I0lO8omVQRqozWenMfdvJo LmAA== 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=KMINqTQzEkCoEAN4PjMT0H+ytbRsyczzbQwGiDa3vJk=; b=OOkuLkQu7RMpteMs821jxd3GH7WZlcfC0EkWQaNF3zffskBX0vDNO7GK4Ii/4KToi2 8nJrrYpzu6EAtyzzJ3sdMYKGz5v3gQKfFMhDNBntB9NPXDrzlhwZ6DMvhsE93poAs2UW rndNUdoIbWvZzVJAzsV9jG+h29r/CUd5vGoLCwIEIJi6GDStE/3CZcDD18AgvlMrSpAF 6tHr3nB5NhBPVVw/eDIzQ1dBg9/Q/9Xpe9ixyjoZYGD3Aka1Y29g2W6JE3+vmlWaneE2 sOWXEvGE3NdyLKmBGwGlbEycKTPkduj47ssFM+aI5SxC+c1Ttl7HEWRA2fJ/vh9BVx3k WSqg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530ZFMQC3YUY9D0sfgbD605l4LxRDMlTXpJ6hOqU39cI0x8EM6N0 e9W4iEh+MlF2dqpTdnvMIkc= X-Google-Smtp-Source: ABdhPJwOgv79IxKcaLOz9kRGraOlw2gsJvj+HiISLHjVFOYQj48HOeH2xUiRDkUiB40u2KvxAQWoPA== X-Received: by 2002:a2e:b0ce:: with SMTP id g14mr52077803ljl.124.1637594795328; Mon, 22 Nov 2021 07:26:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a4c2:: with SMTP id p2ls1082060ljm.4.gmail; Mon, 22 Nov 2021 07:26:34 -0800 (PST) X-Received: by 2002:a05:651c:a0f:: with SMTP id k15mr55552277ljq.298.1637594794258; Mon, 22 Nov 2021 07:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637594794; cv=none; d=google.com; s=arc-20160816; b=G224a+RwhGr1Y69aoO6VeynKv4eFc77Cv8SP6QQCKH6nXaUQwmywr0girutbG+Sa9M 2/1wCq2Xjo/pkurTmXgbOH9H8+dUeWkFpgtmfn+tfSAFWvR57QuWOEOo6SIPywXi7xZX kHs3iTJpMEQ0aQ2nnRe9bKqvvIRwRo6HcflXYnA+FeiK0oLNSCTyvcY3AI5/cic8IXqb QfxJ9UZ90g0V7epYCdYETpkiHU1EVNFkwJv2vlW1PeSCpNCWo8sKfHupt//ALU4X/Go8 REW092r0MpQtxh3eAEENhlU/B9rqiDTZMCa6gCY/UR4nrLfPqG5iusdd48Kr0/BGP4GE 0l1g== 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=ArUNgAMgLly23LeauYT86i10MsGh38/GuZTroTaWnfI=; b=S7FC0uq1+oTabhKVySpqat5NPhEh0gB3SM+aKjl82RNdkll405szE/wbNN7aynynXU MC33Hc7utpeZ+qqgAQBTKEkhQOOfQ7TPY2LA0A4Rqm4bsY5YelqPVZx6uTD4Hy8ohl/f kg+apKQJhkcq3z9Z2TrPeZ+YUzqFrzcXCgl5HQ+SJrP+ASQpZebf4aQeaxJR4RLMQ7YB VkEApvD0sCVU5MDmohjLzkXz89QliDT2kYm1+yhmjkDHSLIGqHgeQUssFoZs0iaqI7u3 vk+TkFQ2mzj8bBCe+UOcJwwgvbY99fferua6JKUOXdAVtsGLtV8gz0oDDmIzseLUkvHA Sp2Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id b29si607674ljf.6.2021.11.22.07.26.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 07:26:34 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: zJ6Ysxd3I0BcOaqdFoEqUkIeUlTOLUUpdR/hlJe2Zayenfzph52tZD+dASatiGmnCeuP9hO6hk DI5uRGBs4KEn6yt7JZHvZ5q24V+afASe7I3wb9Q1lnPR+3q1kwxSVGeQPVgGL5LuFA6pgyGnp9 a8WLB+zc7hNPb89vcuDQFZUeWW/dFTY0JLv5XvjwWHBBDKul1/7eQXJgqzzprU6XXfdwdJ1D+8 RvqmSPxVFaLrZAzb7nhexfCOjHNTqmRHJi+3XgUJgsDn7cWNKwapI81w5U9hSRKxe4FGELXMEW nQYYiv4ElCQmuEMSdFxfBbEJ X-IronPort-AV: E=Sophos;i="5.87,255,1631606400"; d="scan'208";a="68789241" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 22 Nov 2021 07:26:33 -0800 IronPort-SDR: Xc2v+l4QPNflxEehw/e3sWEcQLzhRI2btsFgJwkMPm+QTwdv0dYfL/QfAR8LN3eAiDfmyddT3P lI8TLGfsr7TwoySkw38/WggnrVHUkz5oeiF9A846+xC27Kak50vyXlx8sgh7K/zML0D9Ikqwgo pPa7bv/06IYXSrmjst1O4xU4ZLmb4WUTpVNMNR+WHy+I7gEWT6gDBlDYCkos+IDx9ncqwbM7C5 l2r2h2yOl/9xoLX39QF52al5Kbb8xdx7HIjfbhxy2UzlFRXHKxINBy1WHmB1B9/CaQpwiS3JHI HrI= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v2 3/4] meta: u-boot: Prepare for newer versions Date: Mon, 22 Nov 2021 20:56:06 +0530 Message-ID: <20211122152607.2125422-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211122152607.2125422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211122152607.2125422-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.137.252 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 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 --- meta/recipes-bsp/u-boot/u-boot-custom.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 5198809..cfae0e2 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -41,7 +41,9 @@ python() { d.setVar('U_BOOT_BUILD_PROFILES_remove', "config") } -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 bb.utils.contains('U_BOOT_BUILD_PROFILES', 'tools', 1, 0, d) else ''}" TEMPLATE_FILES = "debian/control.tmpl" TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" From patchwork Mon Nov 22 05:26:07 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: 1105 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 16:26:44 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f59.google.com (mail-lf1-f59.google.com [209.85.167.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1AMFQhGn005194 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 16:26:44 +0100 Received: by mail-lf1-f59.google.com with SMTP id h40-20020a0565123ca800b00402514d959fsf12569598lfv.7 for ; Mon, 22 Nov 2021 07:26:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1637594798; cv=pass; d=google.com; s=arc-20160816; b=KjZASzG4WAxj6fqk5HAI7TEXoKKtf/GpQiH2UsyqBFoTmfn+REsEES0kjRnKZ7qmEp mPV8t82vHmH9PAoZJQ4sFl9m1fuFOFo6/GiVR9fGCC5sfI5vbFLIITDCqYH0fFnP1Ezq Dgk+lo1fHTM5LzCnmNCfaKI6SKthmDOjx1FOCkbC/ovephjUIAkbC/dkgQf1C3AYW1Sw UMNZiyGyn78bw0rQuByYpyF0YcfofkJo/nWN1ceuIC5UVJnvDF2I1qFetbMmEAHU6rsm M6fNW58FLOkGRw4IewkggZsbYD6NGIwasKIcVyHZkQGR1npblI1t02/I5MiFNYp4ljRV SY+g== 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=Cu2XrPGl9JyUw6oR8bsGCCYCFLLaLxh0idJ9vYepAVU=; b=cEnfrXRka+3YXTDt3zi5S9FR/PlLLeQ0hH8R8V6RF3qRSkhtIMxuPounev9+qqPrmE 9RhQwILTbCSvpv9kVXJJ1zj30VGQvfCOoEoqOcWjUOFwZTmccUeTx5TLL8WkzetaXHlp QpI1M2q5g6h+CtomVxcfAo0gz7Mv9URWnC2bmdTM22HthP11QGjfszojJ7ICyCKclVTZ gmFxnbI0xR9N3UNyjso9RIF1ozrdrKTtQrVmQcG726/bJG+sN4chYm1B77ZxDoebbH3P DucN5GKEcxAi5cMOmAmcrrI/wwa8ilq1zvHpI2xzkTIQ1TKt+8T+ep9hCAyW/DNjANsf 9jxw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 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=Cu2XrPGl9JyUw6oR8bsGCCYCFLLaLxh0idJ9vYepAVU=; b=VG+WMTj+yjIH5yI8Kn2qXt6hzRs+sHvHjE7tqXJR+GpjELv3tfQOTFw+F0vNLLFgoo FF+0KsffD5fX82KA31/ikUzi0K7dqzdoFBeAbaAm/PW5WYFpgjUarZ0R41W8AsALbdAm QdwGUPh3F2nzqgU21+obYUZsyNZxW/MpQ6h1MwF+rJOUC3GB5MsetoPpR/RtcvpuARLA THvhmv1ib2545K+mSkUaarRheHFU5kXQIC/EAhLXmPGlftzBa+nm3Ij5JKT0ducjOoTt saa4mfAGpWMBlGsvvvR+6AQlJPsSw+HGDL5T5dewTiU40q4luxOjEAzXlAkF7pT3LsrV pGTA== 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=Cu2XrPGl9JyUw6oR8bsGCCYCFLLaLxh0idJ9vYepAVU=; b=TsxKy/Bl3VJ8bgT4F5lPRKnlUJUNEnsFtsD3eennh6XeX/RRhzqbfVqvHsbQNtm0tr PKY/fH5YJHJrbYfnCfq125OPgxOJ4cVIR9W3qw3vu0il0lrmkkB8nv9NhJgTlw0gaZx2 e+QQsLKEn3lER+ATJH1UVWFWqWHx7iwGGHP3wLF39MlueBhBvVbRKW9vILad6jEW0fAp 6mGx/hEo2F+a1O+kvp7wD/MAWJNamExtvwrQnBJ0ry+/O3ksvDWDTwuVLoXO8HMpQv3F 02S/YIR7VVRhoJWIvhcYbEz+ue7J70IJoj9XuZvplDj9kZEki8uuJi5TXnJVk5MU4S2N OLEw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5339jzO0vDdYF1hRX4amntyb3t3unhn5H3ptqSgrvDQMZ7Wgncli SbzUyMSnOuzIDw3HyQrnMOg= X-Google-Smtp-Source: ABdhPJzCQ4qttkZbIZyHOsxW9N1f/AUJIY5/D6VskJHB6uHvylYpbO/2oHrMSoJ8LXuD/fQCyqFerQ== X-Received: by 2002:a05:651c:1257:: with SMTP id h23mr52201044ljh.17.1637594798594; Mon, 22 Nov 2021 07:26:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1687:: with SMTP id bd7ls1076868ljb.10.gmail; Mon, 22 Nov 2021 07:26:37 -0800 (PST) X-Received: by 2002:a2e:bf06:: with SMTP id c6mr53789527ljr.405.1637594797470; Mon, 22 Nov 2021 07:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637594797; cv=none; d=google.com; s=arc-20160816; b=s9AtGfGR0o9wpna/BeeoNFesiezORbkcfXx7svLYsyq0lPT/ukNks5w7hxt4muG44k l+604f2OjF1koGljQ3/MmiZQfLiU5nELDoV09dajZbjdZd7kxQvTWt6DRv6xL8ObIVCA 8FeZDJvgZ4v8EXYbHKc8/fSdRSvopamq6UTrTyOBXpzMU/aBJwFE8NOh3Xqg9lJuxIUi Pax5p5GvZ6Y8SUhdyJF45zMeJdUZ6YZU/XYgLzfCrF7ySsv6Id7jt7NtVhyWkcS3Cs8b f1rJdfW5ivjOXk6NQVA8ehN6eUM1iHmG3XJRZU6za2BgsI9J9MTXQf2WMj8LVDYimVQu T6Mw== 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=BGAB01uRgkmbdXpGUbtZ2wqWsAadGj9wH34LXWSbuwyQHOr7yKElQBK4k4npGmznRF pk6uKBT9XYGLA/mENtfQB4/wAsknOdk4BmKIjS3T0ToD5plFUMvtmV52D6ek/Euex5iW 8tpoYdyu3Ots2iW93O983/9VgAK4bD7W4w7kYQbUB6U0PamGYtvuyXHhCw0J4rISUb00 58jYuWtcUSaQtC9IdxPRnjQwV7mRxh10hLjVI4r2xWZCIXKUn1NlNSJl3gMA3dp8rKtb fQr2ACyFTyjTXrc3UkR2iGdOywaQx//rQvxr9bMkWihh5Tk7CKjWFK7+PT/NvvTZdPhr SBMg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id b29si607674ljf.6.2021.11.22.07.26.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Nov 2021 07:26:37 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: sRddj217BU22KOZWjpZA+S/P+/i6jkPCwPx8BJoPJ6BvDoXbgW7g0N1UsGzP3D0VCLOIe1LZeH OTPksKUIZLvpzdQ3TPV0z1VIT3bsaSFU01144v7NewgwhnI0dnxwyhaQGHK3uV6x8CGbm4v0zp MmpX0sn+jQ9IzAMK6JdmjE1X5JzX+8IUfZ+6bhhNMXOswXcF8bWqpMHYx2qKSlxTJyQibL9U09 lvAywX3N/zs6VoBfuv6IgAaliV6wmXbrKHtuu+85XvxtHG62fcI8vMYhsMOe2FD1Q5Zb3TLMcV Ans8JWyKvfCiYyIYBM1erbMk X-IronPort-AV: E=Sophos;i="5.87,255,1631606400"; d="scan'208";a="68789245" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 22 Nov 2021 07:26:36 -0800 IronPort-SDR: y8RGbccGuN4yWmPRxq7lY5s34Z6MJqoW2B4GzyiYs6D+dB2ksW2zcJqKnvvG2x8kVI0DfFUPFr dRjzRWKvKLJZOflS76gql3muBnozL/b4uWCpd0AFNkBUddxYyqgqYdgyhuxsdiaQ0lPcjs8EPG A9VHoWPz9za7jpVz+V8v5Pn9DFYFQ56aXMj/O+jIwJzLj2gf+nDxYZ0d3U20q8HQfAk/bn7qay W3jG7xK1iy8Ey19J9fqg2b4X1mQIMbuSGrwN/ymDyr3nOwL2d0m3Is82ZJg/SE1FRKTtDQicW9 Ocg= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v2 4/4] meta-isar: u-boot: Update to 2021.10 Date: Mon, 22 Nov 2021 20:56:07 +0530 Message-ID: <20211122152607.2125422-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211122152607.2125422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211122152607.2125422-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.137.252 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. 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