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: 1494010 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HB5TsEVI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5j2n3nVRz9sTD for ; Fri, 18 Jun 2021 12:06:23 +1000 (AEST) 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-Google-Smtp-Source: ABdhPJyGLjNAXprenZ6qy8oyILGKV28PYj0tGxdl3mQMk+y1sN+IJ/9v+W/1ffU/qiUZIVQz2MBffQ== 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(+) 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