From patchwork Fri Jun 18 02:05:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 463034 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp1030605jae; Thu, 17 Jun 2021 19:06:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2ricwOKnpuNJn6LYYKEvBb5LO3LNpJiKP76UsJVHXkZ19Ce858Ai4DoK5ttDz8jHwPTtN X-Received: by 2002:aa7:db49:: with SMTP id n9mr1680281edt.361.1623981978690; Thu, 17 Jun 2021 19:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623981978; cv=none; d=google.com; s=arc-20160816; b=e3mPXxX49OXawaDHcQg+liI/fbQ2rqOOQwv0Tvdhj2xTcYBs0qNWgWiv9eYjprFXtp 27KiyIgAa/y0nObbMUoZfFQ8kFkvv1GRBFMvri2TAScu1xwt87W9x3i+2J4164KSa4Lp 2ioO7816GHF9eEJtFc6d3VlsG2OQjl73lXCjj3tMTgZyApsIvn4ykq0DYJUTnX4t76ai SpjjtyZX53tCseAhUVsOBjXfek8968MdcNbfDTl1mBcYqI6EIOxvP2pgItJKddKOWfub IHlXmNC9KiF27Uy20MZUP38cxZFA7W/6EAMre7O3o7y4u6vt2M1sqXCuBaGgc/OvlhdL bqPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=htwlLudkZ1pqKKqW2dcgr+s7K6Deuk5Q9LJrzciwriQ=; b=gvdL+hW4MJh4vBBA5stt5jitAgO8XHNiF/WaQS8co6wBk33X0gknmGphTVekzy0mLx pYPNmHnG6q+BkzyDBXgFoHmf5pBTNuGAWGiIc7z2UC1sYtGghyaw1kr2G7iKBRhMgWN3 oR7GGCXFD69aLjAP//cHnVntQmi2/uvxGXhoEMRH47+9r6RHVN++rTg94XwtPb4PAsW0 u7tE4aPK6pzXRr5XyPWfB8LCfhWyr8MCElyaZwvduhe/f37Xz+Mb85kiQye/kAYB5ij/ d1aKttC62lUEuQqVQj7rvGKe6yqK9A9qXvzUt2q2LrIU2PCb5eh4HimkbjStsFrnxEQA H1Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=HB5TsEVI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id s2si865756ejj.704.2021.06.17.19.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 19:06:18 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=HB5TsEVI; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B7AC2801D7; Fri, 18 Jun 2021 04:06:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HB5TsEVI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC6C98047F; Fri, 18 Jun 2021 04:06:13 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SBL_CSS,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D246A80092 for ; Fri, 18 Jun 2021 04:06:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=joel.stan@gmail.com Received: by mail-pl1-x630.google.com with SMTP id c15so3813727pls.13 for ; Thu, 17 Jun 2021 19:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=htwlLudkZ1pqKKqW2dcgr+s7K6Deuk5Q9LJrzciwriQ=; b=HB5TsEVIN2Dk1F8oTal5ZDGo7llGSiKba11PZ3DgV5eA43IAd14LbKPXu2EDuiGc5c JrlVdjNoG6w768rUb5ZwExgQLYAB17+48VKvT2MV0GavcgDzdD2N9ffiPIvICq6/GdC1 fI00CkRVtJ9f6cwRH1Ns2P17BsFycciIJnhA6rC9z2UA/XQuAjwuRMg0x/xmbFRCC9lb hnBvHCWUKs5Kygl2em2QL16FJOhzaMWUQPHDc0Z55AodxzQ5cmzpHsSLcdejDQhatOhj L/scumt2gK2ZU0kWVjsydA2yAgPLcvDlTqj0iwyI4B+hGfTi3hKC0hZo7BovSn+3AqxF +XiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version:content-transfer-encoding; bh=htwlLudkZ1pqKKqW2dcgr+s7K6Deuk5Q9LJrzciwriQ=; b=YVPx58CofEaG9k4iEeFn5udK49YMoZcFsbENhlePRpxcnPsm8VTihsk0aDwC8ks1L8 jZ0NPiVrpJirtKsDv6CzI6wVKDzS9DcapSDm3hb7azZFCYLvox4TvbcU/Wf2q98O1uZo J1sp4AvnuEQ2ciDPGTW+eZymrhpWAiyH6B3qdAH87fLkotvm+tqWeSHvXeYwuzz4uwCO bdjN+sc2Uxhj2KzNAIla5hzmo3dpQn+fqIJKxpkTjCeUBBW6LzeKtK5WMHZd3pZgcG0C 8OLpUe8CXI2h/3Bm9bN4zI9tPGT6jfWk+4izFDPq+TbEIgTGnFJJW3rKbF829w1VIvIh 3PMw== X-Gm-Message-State: AOAM5327yDlwzD3nWsI6wmniBkyCb2ML/FwTpQssZuYd3IfvGQb1ZaGH cUq/TsBuBpCmJFnUuF2Mw+Y= X-Received: by 2002:a17:90a:4dc5:: with SMTP id r5mr16702302pjl.203.1623981969100; Thu, 17 Jun 2021 19:06:09 -0700 (PDT) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id i22sm6283036pfq.6.2021.06.17.19.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 19:06:07 -0700 (PDT) From: Joel Stanley To: Simon Glass , Bin Meng , =?utf-8?q?Marek_Beh=C3=BAn?= , u-boot@lists.denx.de Subject: [PATCH] Makefile: Conditionally add defaultenv_h to envtools target Date: Fri, 18 Jun 2021 11:35:59 +0930 Message-Id: <20210618020559.891395-1-joel@jms.id.au> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean When building the envtools target with CONFIG_USE_DEFAULT_ENV_FILE=y, the tools require generated/defaultenv_autogenerated.h. In file included from tools/env/fw_env.c:126: include/env_default.h:115:10: fatal error: generated/defaultenv_autogenerated.h: No such file or directory 115 | #include "generated/defaultenv_autogenerated.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Joel Stanley --- This is the minimal patch to fix the issue I was having building under Yocto, which explicitly builds the envtools target separate to the rest of u-boot. A similar change is probably required by the 'tools' target. Alternatively, the tools and envtools could depend on a prepare target, such as prepare1, which includes all of the prerequisites that are listed. Makefile | 2 ++ 1 file changed, 2 insertions(+) -- 2.32.0 diff --git a/Makefile b/Makefile index a73481d18c14..e096dc999c42 100644 --- a/Makefile +++ b/Makefile @@ -1871,6 +1871,8 @@ endif ifeq ($(CONFIG_USE_DEFAULT_ENV_FILE),y) prepare1: $(defaultenv_h) + +envtools: $(defaultenv_h) endif archprepare: prepare1 scripts_basic