From patchwork Fri Jul 19 17:21:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 1134216 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=none (p=none dis=none) header.from=wwwdotorg.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qyVP54nRz9sBF for ; Sat, 20 Jul 2019 03:22:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 34F59C21DAF; Fri, 19 Jul 2019 17:21:56 +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=none 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 EFE28C21C27; Fri, 19 Jul 2019 17:21:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1946DC21C27; Fri, 19 Jul 2019 17:21:52 +0000 (UTC) Received: from avon.wwwdotorg.org (avon.wwwdotorg.org [104.237.132.123]) by lists.denx.de (Postfix) with ESMTPS id 98462C21BE5 for ; Fri, 19 Jul 2019 17:21:51 +0000 (UTC) Received: from swarren-lx1.nvidia.com (unknown [216.228.112.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPSA id C146D1C04F0; Fri, 19 Jul 2019 11:21:48 -0600 (MDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.3 at avon.wwwdotorg.org From: Stephen Warren To: Simon Glass Date: Fri, 19 Jul 2019 11:21:17 -0600 Message-Id: <20190719172117.113762-1-swarren@wwwdotorg.org> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-NVConfidentiality: public Cc: u-boot@lists.denx.de, Stephen Warren Subject: [U-Boot] [PATCH] Makefile: fix implementation of BINMAN_DEBUG 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" From: Stephen Warren binman only accepts the -D argument early on the command-line, yet the Makefile currently passes it near the end. This causes the build to fail if this feature is used. Re-order the command-line to fix this. Signed-off-by: Stephen Warren Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- Note: This appears to be a change introduced in u-boot-dm.git master; the binman currently in u-boot.git master doesn't seem to need this. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 704579bec193..5906871ef27f 100644 --- a/Makefile +++ b/Makefile @@ -1196,9 +1196,10 @@ u-boot.ldr: u-boot # --------------------------------------------------------------------------- # Use 'make BINMAN_DEBUG=1' to enable debugging quiet_cmd_binman = BINMAN $@ -cmd_binman = $(srctree)/tools/binman/binman build -u -d u-boot.dtb -O . -m \ +cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ + build -u -d u-boot.dtb -O . -m \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ - $(if $(BINMAN_DEBUG),-D) $(BINMAN_$(@F)) + $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex