From patchwork Sun Aug 27 16:48:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 806277 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.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=google.com header.i=@google.com header.b="d4/sldYt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xgLTg1SFHz9sD9 for ; Mon, 28 Aug 2017 02:49:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 773B4C2226D; Sun, 27 Aug 2017 16:49:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 51EABC22233; Sun, 27 Aug 2017 16:49:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 872DCC22233; Sun, 27 Aug 2017 16:49:02 +0000 (UTC) Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com [209.85.218.49]) by lists.denx.de (Postfix) with ESMTPS id D03FAC2222B for ; Sun, 27 Aug 2017 16:49:01 +0000 (UTC) Received: by mail-oi0-f49.google.com with SMTP id g127so15711940oic.1 for ; Sun, 27 Aug 2017 09:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Hd3aAavKJ7a9HZYfa3dP+766UF5LsRRNP1uFvSMY4a8=; b=d4/sldYtMfQdZmdwjxDS++11cCkhZsHe1X0cjN31Xv5Nvy0+omKejzLw0VZ3qSbRSw 33I8tSFKbHh1VIJDC0K4N3HqcnjI2esovqOQjweQrd1qFXF35Jo5jfagU+KYS3qs9RHT X2Dh204Rzl9bwsXE/vRCdjg7ApsdiXdSCdiqzERPFEo4RgLH//9/x3Cg9pwAvyYyEpJD tUtqUDr3IQFh8EuncjkMOL80wACo0t3tXA3tHgHjO4Q8g4Ht/4kBmotEmHuGLxPMzXCv mRcftivGC4qOvk3SsuJASGG8syb+i0Hv1JfWKQLA7O3bI49KRboYi6/myRZsvVFoUreX zjow== 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:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Hd3aAavKJ7a9HZYfa3dP+766UF5LsRRNP1uFvSMY4a8=; b=trQ1tRH6NL9s4H9+rvU06LOfKdF7iSnTSSRORYRo8Jz/mE0v/sDXjc/0n3CXW0/bLf gcGR72ib5/ZzpXg8yrCS/oxWsy0PAnGIOwl9nlxTzHIYjDNneaKzKmlDrN2eT8Ks2wYO VYz5gNny7ETa61ClWWzc8jXZRx043D7iFwsrKr38QvsQh1BR63dgv004Ac/ZEfNopNB3 w94B0hy309iDhB4Os+ee0cJHqVjewbxs/tbJn1soZ6MUcoxU8gaG18Xj6b90u1+fjbo6 n/hmqknqexx1v4ZyNOz6I61cStxaulzoxJojdVAODhpNVW4fTxruWAN7WumRENusZHZH v1hA== X-Gm-Message-State: AHYfb5jSsVgQAkcn2w5+R9pGDmknf8ILfMPSPRuzU0P9DVb+wjhgSFA+ 5VMLITX66276kF6k X-Google-Smtp-Source: ADKCNb6M4SpUj4RBRYWvhDIrObQ+Dt4g0ocLjxz2CFmW4diM09kjFi7VaD3y67XABBGUf4gKE26M3g== X-Received: by 10.202.48.195 with SMTP id w186mr3228303oiw.143.1503852539976; Sun, 27 Aug 2017 09:48:59 -0700 (PDT) Received: from kaki.bld.corp.google.com ([2620:0:10f2:12:f00e:676f:b9cf:8415]) by smtp.gmail.com with ESMTPSA id p65sm11948929oia.49.2017.08.27.09.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Aug 2017 09:48:59 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 4DD5B4001F; Sun, 27 Aug 2017 10:48:58 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Aug 2017 10:48:47 -0600 Message-Id: <20170827164850.31986-1-sjg@chromium.org> X-Mailer: git-send-email 2.14.1.342.g6490525c54-goog MIME-Version: 1.0 Cc: Tom Rini , =?utf-8?b?TcOlbnMgUnVsbGfDpXJk?= , Joe Hershberger , Andre Przywara , "Jr."@kaki.bld.corp.google.com, Cooper@kaki.bld.corp.google.com, Franklin Subject: [U-Boot] [PATCH] env: Fix operation of 'make environ' X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This was broken by the recent environment refactoring. Specifically: $ make environ scripts/Makefile.build:59: tools/environ/Makefile: No such file or directory make[1]: *** No rule to make target 'tools/environ/Makefile'. Stop. make: *** [Makefile:1469: environ] Error 2 Fix this by updating the Makefile and adjusting the #include filesnames in two C files. Fixes: ec74f5f (Makefile: Rename 'env' target to 'environ') Reported-by: Måns Rullgård Signed-off-by: Simon Glass --- Makefile | 2 +- tools/env/env_attr.c | 2 +- tools/env/env_flags.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a0f3bfd2a52..dd9d5678118 100644 --- a/Makefile +++ b/Makefile @@ -1466,7 +1466,7 @@ checkarmreloc: u-boot fi environ: scripts_basic - $(Q)$(MAKE) $(build)=tools/$@ + $(Q)$(MAKE) $(build)=tools/env tools-only: scripts_basic $(version_h) $(timestamp_h) $(Q)$(MAKE) $(build)=tools diff --git a/tools/env/env_attr.c b/tools/env/env_attr.c index 502d4c900bf..4d8536335c3 100644 --- a/tools/env/env_attr.c +++ b/tools/env/env_attr.c @@ -1 +1 @@ -#include "../../common/env_attr.c" +#include "../../env/attr.c" diff --git a/tools/env/env_flags.c b/tools/env/env_flags.c index b261cb8e390..71e13e2021f 100644 --- a/tools/env/env_flags.c +++ b/tools/env/env_flags.c @@ -1 +1 @@ -#include "../../common/env_flags.c" +#include "../../env/flags.c"