{"id":810244,"url":"http://patchwork.ozlabs.org/api/patches/810244/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1504635609-23585-1-git-send-email-trini@konsulko.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","list_archive_url":null,"date":"2017-09-05T18:20:09","name":"[U-Boot] env: Fix out of tree building of tools-all","commit_ref":"2d3229bea240a26516e70257e26757d0ec0d98f1","pull_url":null,"state":"accepted","archived":false,"hash":"ceba7b41895640a5fd66f9cf6f750e70ace2e856","submitter":{"id":65875,"url":"http://patchwork.ozlabs.org/api/people/65875/?format=json","name":"Tom Rini","email":"trini@konsulko.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1504635609-23585-1-git-send-email-trini@konsulko.com/mbox/","series":[{"id":1626,"url":"http://patchwork.ozlabs.org/api/series/1626/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=1626","date":"2017-09-05T18:20:09","name":"[U-Boot] env: Fix out of tree building of tools-all","version":1,"mbox":"http://patchwork.ozlabs.org/series/1626/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810244/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810244/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xmw3v2t6Fz9t1t\n\tfor ;\n\tWed, 6 Sep 2017 04:19:55 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 19EA4C21E4D; Tue, 5 Sep 2017 18:19:48 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id DCB63C21D09;\n\tTue, 5 Sep 2017 18:19:45 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 200D1C21D09; Tue, 5 Sep 2017 18:19:45 +0000 (UTC)","from mail-yw0-f194.google.com (mail-yw0-f194.google.com\n\t[209.85.161.194])\n\tby lists.denx.de (Postfix) with ESMTPS id 88F25C21C45\n\tfor ; Tue, 5 Sep 2017 18:19:44 +0000 (UTC)","by mail-yw0-f194.google.com with SMTP id p77so2217910ywp.3\n\tfor ; Tue, 05 Sep 2017 11:19:44 -0700 (PDT)","from localhost.localdomain (cpe-71-77-251-1.ec.res.rr.com.\n\t[71.77.251.1]) by smtp.gmail.com with ESMTPSA id\n\tm76sm434268ywd.10.2017.09.05.11.19.41\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 05 Sep 2017 11:19:42 -0700 (PDT)"],"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,\n\tRCVD_IN_MSPIKE_H3,\n\tRCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=LKlpYFwza5uBA1vlNdTXZ6jQ84ONWVLeD0308J/PdRU=;\n\tb=FpM1/641LDfQ1jraiLvqlSVItZ16ZS2DuGY4YhsyVhO4l9i0lCR6xqU3boZx6o92UW\n\tuy0XwEk4qOk2TovAt0bsk0my4KyKlCbTZySEihjhs23/vyS7bNTU2n8p/tUv0sDoqkzO\n\tMzyNBcxSks1HSJJWM7xPa/hcZsFdLDVcc06+4FU2Lwh/ADB43rMiryB80X2E9/PLcox8\n\ts6jJoPlo44hJlTaGaS6rjzsE8qeAL93BeZI/VTLjvaIpmluwEUzNCB7Sh3OqLIRRkV+a\n\tcnBU/JvuZRzMEDs8gRiCBWWYybzirSB/dzG3+cbSCRYPeqcCcUL/MTEa/x8PkwTaHI2W\n\thtBQ==","X-Gm-Message-State":"AHPjjUj7ZG/vvG15k2wRdfRfokLxEFDx594/Ar1IuGbvw7GJUHtj+W6W\n\tQDQKPfThN5RRB/m7","X-Google-Smtp-Source":"ADKCNb7HhQrUJvDALde2PaEHCOia3rlgmStVYDoOa8OrqC+2wCm5V8gCYTNo0SYELRj4BRXQSXThlg==","X-Received":"by 10.13.251.71 with SMTP id l68mr4040329ywf.184.1504635583268; \n\tTue, 05 Sep 2017 11:19:43 -0700 (PDT)","From":"Tom Rini ","To":"u-boot@lists.denx.de","Date":"Tue, 5 Sep 2017 14:20:09 -0400","Message-Id":"<1504635609-23585-1-git-send-email-trini@konsulko.com>","X-Mailer":"git-send-email 1.9.1","Subject":"[U-Boot] [PATCH] env: Fix out of tree building of tools-all","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"With the move of environment code from common/ to env/ a number of\nchanges needed to be made to various make targets. We missed updating\nsome of the files required for out of tree builds of the tools. Correct\nthe 'environ' target to know that we need to work under tools/env/ still\n(not tools/environ/) and then update the wrappers in env_attr.c and\nenv_flags.c to point to the new correct file.\n\nReported-by: Peter Robinson \nSigned-off-by: Tom Rini \n---\n Makefile | 2 +-\n tools/env/env_attr.c | 2 +-\n tools/env/env_flags.c | 2 +-\n tools/env/fw_env.c | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/Makefile b/Makefile\nindex 792162521155..020ebd50ad22 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1466,7 +1466,7 @@ checkarmreloc: u-boot\n \tfi\n \n environ: scripts_basic\n-\t$(Q)$(MAKE) $(build)=tools/$@\n+\t$(Q)$(MAKE) $(build)=tools/env\n \n tools-only: scripts_basic $(version_h) $(timestamp_h)\n \t$(Q)$(MAKE) $(build)=tools\ndiff --git a/tools/env/env_attr.c b/tools/env/env_attr.c\nindex 502d4c900bf2..4d8536335c30 100644\n--- a/tools/env/env_attr.c\n+++ b/tools/env/env_attr.c\n@@ -1 +1 @@\n-#include \"../../common/env_attr.c\"\n+#include \"../../env/attr.c\"\ndiff --git a/tools/env/env_flags.c b/tools/env/env_flags.c\nindex b261cb8e3907..71e13e2021f6 100644\n--- a/tools/env/env_flags.c\n+++ b/tools/env/env_flags.c\n@@ -1 +1 @@\n-#include \"../../common/env_flags.c\"\n+#include \"../../env/flags.c\"\ndiff --git a/tools/env/fw_env.c b/tools/env/fw_env.c\nindex 965e1662d702..ab06415898c2 100644\n--- a/tools/env/fw_env.c\n+++ b/tools/env/fw_env.c\n@@ -755,7 +755,7 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count,\n \n \t\t/*\n \t\t * If a block is bad, we retry in the next block at the same\n-\t\t * offset - see common/env_nand.c::writeenv()\n+\t\t * offset - see env/nand.c::writeenv()\n \t\t */\n \t\tlseek (fd, blockstart + block_seek, SEEK_SET);\n \n","prefixes":["U-Boot"]}