From patchwork Wed Jun 13 02:37:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 928625 X-Patchwork-Delegate: sjg@chromium.org 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; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="YvXq26iG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 4159xj5yr4z9s1B for ; Wed, 13 Jun 2018 12:41:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 721E5C21E12; Wed, 13 Jun 2018 02:40:51 +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_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 E068BC21E2B; Wed, 13 Jun 2018 02:38:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 23C06C21CB6; Wed, 13 Jun 2018 02:37:54 +0000 (UTC) Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by lists.denx.de (Postfix) with ESMTPS id CA829C21E1B for ; Wed, 13 Jun 2018 02:37:50 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id a3-v6so1976463itd.0 for ; Tue, 12 Jun 2018 19:37:50 -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:in-reply-to:references; bh=6uA8Y1U/KtxKKJRxVO6cpTcPXIli2FJOlBGbcOiI9Fk=; b=YvXq26iGNn7YbWY9glk2S110c/UPwdEjry4wO9tqlT+4pEVpW8C/BBPzlEsABTTXi9 ae1kQVzE/MKOpcOx7wnMNTIG+EyZBuwZ3CIoFzIXlYO68Ct0aXR4MvUrF6ChX5X2wb+H EH/rs/+c/cHnvyKUAijOPoV9V/CsRt9ZVsvjv2l6TAjEmU+TUtn3BSQa5jgpr/7adXV5 FnwQET1lquyhUntJrYJ58EuijoQJyl/E/+yDdatKj/MGMPPzOfkw9SP2XMbp+4FLDPuk lnQ2IsEY7F9tT0zZw0GH9zJGIvo2TcGeiaUsIMtoNry/ZMmYZsz9+5AMb2nn19KS7uxe pqvA== 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 :in-reply-to:references; bh=6uA8Y1U/KtxKKJRxVO6cpTcPXIli2FJOlBGbcOiI9Fk=; b=dhFndEHQ0eGrwespMEcKr/Lb787ZeTlKkAjT2FUBvHfi9SCXFtLro0X5isHaE/pzcf NGXnA0p8vwLP3Z/wvnctTyTKtZwnZLGhA+3MD+wyNlsucggznxYKE+08zXWuizOIe1fa ybJdORbwIj1wM+Fu9AVJZcfz3VZP5wG5XqskL/VDow0Dz6diJ6Z9QUhbSif/4NnRMfpl s5mDVuE8uRyDnOVP4CH9R6LDnoQFyVV7qfkoxBUF9/nKxoJvBzEvzAi7q+udLPfwAL75 Wszgt6ekNYzEIElza4JVqmF2w75i3Rm/fO1+mt6CYkbX5KwPfeE/UCRkycjjGvgF4tYi sfhg== X-Gm-Message-State: APt69E3qGlk73GxG1tLfqcYrhhOcWyRzJvzwk4clh8FkoPZiD0tH5zMW ZnRyOdMB196ONNoW+NgXmniFmA== X-Google-Smtp-Source: ADUXVKI/XWJQSbgiyWKoumMXMZHyz9rpt4L3iVDcPsaig1qZSpXRluq/v/JLkZroOBPf0bBJojHW+A== X-Received: by 2002:a24:1cc8:: with SMTP id c191-v6mr3035172itc.139.1528857469034; Tue, 12 Jun 2018 19:37:49 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id w8-v6sm545795iof.84.2018.06.12.19.37.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jun 2018 19:37:48 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id 064FF1404EA; Tue, 12 Jun 2018 20:37:48 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Tue, 12 Jun 2018 20:37:28 -0600 Message-Id: <20180613023728.202173-14-sjg@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180613023728.202173-1-sjg@chromium.org> References: <20180613023728.202173-1-sjg@chromium.org> Cc: Andy Shevchenko , Heinrich Schuchardt , Alexander Graf Subject: [U-Boot] [PATCH v6 13/13] Revert "buildman: Extract environment as part of each build" 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This reverts commit 0ddc510ea37aa578b8cb197840a5125409978bec. Signed-off-by: Simon Glass --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None tools/buildman/builderthread.py | 10 ---------- tools/buildman/func_test.py | 5 ----- 2 files changed, 15 deletions(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index c84ba6acf1..0efe80d945 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -351,16 +351,6 @@ class BuilderThread(threading.Thread): lines.append(size_result.stdout.splitlines()[1] + ' ' + rodata_size) - # Extract the environment from U-Boot and dump it out - cmd = ['%sobjcopy' % self.toolchain.cross, '-O', 'binary', - '-j', '.rodata.default_environment', - 'env/built-in.o', 'uboot.env'] - command.RunPipe([cmd], capture=True, - capture_stderr=True, cwd=result.out_dir, - raise_on_error=False, env=env) - ubootenv = os.path.join(result.out_dir, 'uboot.env') - self.CopyFiles(result.out_dir, build_dir, '', ['uboot.env']) - # Write out the image sizes file. This is similar to the output # of binutil's 'size' utility, but it omits the header line and # adds an additional hex value at the end of each line for the diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 363db9d8ce..9206fb299d 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -327,9 +327,6 @@ class TestFunctional(unittest.TestCase): def _HandleCommandObjdump(self, args): return command.CommandResult(return_code=0) - def _HandleCommandObjcopy(self, args): - return command.CommandResult(return_code=0) - def _HandleCommandSize(self, args): return command.CommandResult(return_code=0) @@ -362,8 +359,6 @@ class TestFunctional(unittest.TestCase): return self._HandleCommandNm(args) elif cmd.endswith('objdump'): return self._HandleCommandObjdump(args) - elif cmd.endswith('objcopy'): - return self._HandleCommandObjcopy(args) elif cmd.endswith( 'size'): return self._HandleCommandSize(args)