From patchwork Mon Jun 21 08:00:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 544 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:6456:0:0:0:0:0 with SMTP id d22csp2836981oof; Mon, 21 Jun 2021 09:00:54 -0700 (PDT) X-Received: by 2002:a17:906:1c4e:: with SMTP id l14mr25419902ejg.172.1624291254394; Mon, 21 Jun 2021 09:00:54 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1624291254; cv=pass; d=google.com; s=arc-20160816; b=gK7jp1+KP9/zep8Orxa7Y5V9FcqjgsTYxpmMyQ8IH33GrBZSSkcIo7MhEYkJxqcdnz 8KT94PBN9o0T8/QH/ylL02sUFKoL9uV/1KICHacgOoyoaHNBEHk3VPwhef9EqAqyioJs awVlYcZuIc3EnQf2r85tZkZqUojev7IGhkMa+0SAlgJJ9/3F9pw+LVS45vNU6OxjISoj 9T4hofw2kLh6GnNjqx2f/Ww5UAzkVaEEiV9FcnrWXJZuUXYu2ZGHHAsVRAuROdtVr0DV qOXISggSdOw7my8doQ/lz35HpwW2dD/VyKw8IPW2W6abkl5lojnexhEpgIfyLmKPZvoD U8SQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=FBIV7yKbV7h10cuIiJ6ENHqD1XHFaTKQVG/Q9WCagU0=; b=Ez8lPExglIrlHBV1DsdXfTA9Gx0OmetmO/yXf4j581QFa94lKT2ykbi7fJdZ0PR/Dy 0xzSYrHPxOSDRj319Vxu36nUPvEQ+BN0+N/8wzvUQ65PnLeh+eQ+eJBpCUN+MILOCNbb xovoiZtQPwIHRsUD9cyeZDkhz3IcEv3wtgmiMXKliSw0eLh+A8h3plOpZx2RiT2l1PAO ZKuGGZWoIuh9nNqXIs5a/XmOImc1GhggloQ1WA91IIJ6LeyBXi3OWYCNm2XPu6MwxHQo +KSOWZu5k4bsqu0o9PmCK4pSmtJw14VtGooxZoYa3gL83DQxco0IdgpBxefpJVhqZGDb H63Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=FekQswb8; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbnppykdamgqe63clbty@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBNPPYKDAMGQE63CLBTY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id kq12sor3137492ejb.33.2021.06.21.09.00.54 (Google Transport Security); Mon, 21 Jun 2021 09:00:54 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbnppykdamgqe63clbty@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=FekQswb8; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbnppykdamgqe63clbty@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBNPPYKDAMGQE63CLBTY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1624291254; cv=pass; d=google.com; s=arc-20160816; b=OfZXD0mpj4+/JZi8v587HMoXCrnx4fEVqzbH5kCpkvF2sBES/qyRd0Zihryxm58vWy 2eG7T/QW4Uu0cJc2QfPhsuIEoI0uxHvRtwTCuP3ZPGr24vr0pqdU/JTFqp/eHVlX910M SSfFAAaeGn4rEeXro/wwn0uIAQjGllobbFjo+BJecFB038+ipfdycbyTrCjtYHAVEyt6 57DCrfQvWqAvpp6UjNu7GhzrimKakp66P1aJVwMtM3m5npMLjh8NOKpcjcDLY3rIbLdB TBpgm4HaicdWdMAphqC9/6+14V8oaNbkjCWtRAO2ZOxfPW6kYLt2j8A1U0ydVKMRj64P l2rQ== 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:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=FBIV7yKbV7h10cuIiJ6ENHqD1XHFaTKQVG/Q9WCagU0=; b=Mxig6em5vABAjbwVJpXCdHej6wHtWGDzgx8VFVodneNDLcjyFBN8gtbo4CrJ9U7Txn eq+3PQHGVLUbCzI6RIKMsirUFSgRMtw1v/7Iy0tdVlSFSjs7gQ0Hl029xPtAC/gcuK5v 5raX7AAOK9vF+H+koGpwWCOkp2yOr8ahV7Myl5myBMWkOGuld1/+O6oAnNbw56QpyeSc uX19bJS56ppfpiTEAU2Zu/hqeQMRfffkQfuSbn/c11J0He7qR1yb0uALFezULwMBREuA 0+Qh4NqZd02vKhpkszKjArSgrIPHX3bkfWRLgzn7Zm+jM/tuxEgm/aXKk7rvYoNfANIq 74Fw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=FBIV7yKbV7h10cuIiJ6ENHqD1XHFaTKQVG/Q9WCagU0=; b=FekQswb82ZIIBnr3pcj9q3AwnP+QhjChL7MItsrqLor+eZdlHofeEoNkB4iJvAxouI SlD06dNAPmRWOIeK5L2A9XEnTX9ZrHt+tz5wO6boELENNb9o/UbgeDxDre04Kppgrk4f wztThdGWCoxMJ4OdwID+NZYlst4kLJ7XSGclXmSCW18JIieWD7xF8cF4nX1U18W/MniQ vdu42sq1E/531DLcGuTkEir9G29X4joU5rnMWxWNkIQBvqayVSG38ToOXw5Cv0eBZZBR TX04cuHMGePPXm4yrCE0iQmUhyfjpZ8HLSiIz/3bNiGLy2q4jUwLD6q60eZKPtUgyA4u ybTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:subject:to:cc:message-id:date :user-agent:mime-version:content-language: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=FBIV7yKbV7h10cuIiJ6ENHqD1XHFaTKQVG/Q9WCagU0=; b=TS6PobRdYeFXbbcWP7CJyUuvq2pKjjqaloT6ivXp+nQfXmgJu51x11zMfhgXJXYkM2 lTwfuka9cex8SETSQratWrk4WqNKiUNq6L/9hOr4IaTvx9f+keXi6s/13Fi9zOPi0VhR 2+NSE+INVHQIbTSOnjs5bFwn6MkdhC70S2CZ0gjC0+hHCM2S6FziTb6IpBpOd8qsYkvW +qYdEfIuTd38WgtVB6etr0zkn767XMW3IMViWxpVyh0w1KePfBuKfxuaKNF3iurN7RAN ixK5IdaZy4XQxCD2pLOM0bbsZe5H8iekmxN434hnQpOE4wNvfIBHw5KTLGVK/UGTp67c /AhQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533/InrHthnE0J2dvLRTKDc35mKCqjGypaxejvxf+zg4UWxShKGQ kmn2pURov3INZ1jT3oLeVHM= X-Google-Smtp-Source: ABdhPJyemZkeXDaA+/KGzDeqfRNakQw3ueQnVMAlDf8zlYCGYrO4p2A1hFrXe2P9jjewWbZsGKe2Lg== X-Received: by 2002:a17:906:25db:: with SMTP id n27mr24821715ejb.170.1624291254098; 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-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 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; 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-Language: en-US X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1703192826746472801?= X-GMAIL-MSGID: =?utf-8?q?1703192826746472801?= 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 Reviewed-by: Harald Seiler --- 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: