From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6976277815930912768 X-Received: by 2002:a17:906:dbf3:: with SMTP id yd19mr25780241ejb.399.1624291254140; Mon, 21 Jun 2021 09:00:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:58d6:: with SMTP id e22ls4903060ejs.7.gmail; Mon, 21 Jun 2021 09:00:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwY6TRdKIxppmUVfLmOR8nzqRzxoGHZpkt/OX/0OMFZ+WJK1fMbve9htWXNeZyeFKh8Hojg X-Received: by 2002:a05:6000:1786:: with SMTP id e6mr16820753wrg.141.1624291253219; Mon, 21 Jun 2021 09:00:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624291253; cv=none; d=google.com; s=arc-20160816; b=nhvs/uS0imZPzr14ive7AFLqNHPv+kdX5RQQXvY3UAo0FiP6RKHs8tGwheN2hNim7i ImfB9W1GIMYYj72VvbU/Y3RPUjyNoOafgINdygivvZmddg6omZeUdznVLp28fbjTg5fv VcLczjI9yxhqySim0RVenYk1mRVEkJ+mZ275LU9xQ3028tJdbV8YFM32LZuIURfPBm7N KCw6VYjLSGc/JyDMl8POayycTgEM3Og8JjcvJT0SDHs2AsnTvcyV3rbGogSgvz0J0YoL OSQnp6FWgJPAD6t0UXvpOWGquTUnqcQVcdRw01eZsvNL1tx7fuQACXo02ue7f5B3E1i0 Xqvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=Ha43K3exxT5IAhiZQH65Jl4WADaX9mHnVBRYDl3lC84=; b=ZoZvDaXGPqsJfDBuyoGReiQcpSpsJ+oEesjLD77mcrFgV2pm27wQdLbuYiUUji5SYO GYSNEDhoyRkfHonOt8S7ruk9sCZ06faf4EOO4Ywrc6JPd6qDQMfwb49AY0i1ctIgJ9+v sAWfiMKD61Yl4HUVYtJC3ROSages3eGxREs6+SY2pdhoiloXlTy5YomXYPMhTP9QzzD2 1mOB7uYkX7z0DJhNlt3e7ujzMEx7VoMtOsBJtkKSMe5JACv0CqVxPYn4pgHpMBKCZRr4 AN09OWgsctCH5hCphGCvIFqspGhqi3zvW3w2Hnw89AlUICLoPBF5fC5CQkL9KHxdqIXM ps+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id f23si994562wmh.2.2021.06.21.09.00.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jun 2021 09:00:53 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 15LG0qif017453 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Jun 2021 18:00:52 +0200 Received: from [167.87.243.122] ([167.87.243.122]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 15LG0ptV029034; Mon, 21 Jun 2021 18:00:52 +0200 From: Jan Kiszka Subject: [PATCH] u-boot: Use new makefile target for u-boot-initial-env where available To: isar-users Cc: Harald Seiler Message-ID: Date: Mon, 21 Jun 2021 18:00:51 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 5i3G6WzBdzQu From: Jan Kiszka Since 2019.07, u-boot-initial-env is available as build target. Latest U-Boot has troubles running the get_default_envs.sh script, so better switch to the official target where available. Signed-off-by: Jan Kiszka --- meta/recipes-bsp/u-boot/files/debian/rules | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules index 85bda91..a5c2cd2 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules +++ b/meta/recipes-bsp/u-boot/files/debian/rules @@ -3,7 +3,7 @@ # Debian rules for custom U-Boot build # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 +# Copyright (c) Siemens AG, 2018-2021 # # SPDX-License-Identifier: MIT @@ -15,7 +15,11 @@ endif override_dh_auto_build: $(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG) $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN} - ./scripts/get_default_envs.sh >u-boot-initial-env + $(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \ + $(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \ + else \ + ./scripts/get_default_envs.sh >u-boot-initial-env; \ + fi $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools override_dh_auto_install: -- 2.26.2