From patchwork Sun Nov 10 16:25:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Hebb X-Patchwork-Id: 1192644 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 (no SPF record) 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="enFt6awa"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47B0rh1VDsz9sNT for ; Mon, 11 Nov 2019 04:10:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DF7DDC21E70; Sun, 10 Nov 2019 17:10:32 +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=FREEMAIL_FROM, 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 BCB9CC21E75; Sun, 10 Nov 2019 17:09:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F0807C21C50; Sun, 10 Nov 2019 16:25:17 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 5815FC21C4A for ; Sun, 10 Nov 2019 16:25:17 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id q17so7591868pgt.9 for ; Sun, 10 Nov 2019 08:25:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G7LFMT8PulGemZuHLdo1sIzq6dsz2chBhX40nOkheAY=; b=enFt6awakT1IBGbe/mrs7rPKHbTKxNXDWvlZWrcbetUma52iXOsmsNwaDDdjkRGc+K guzWXFHVD5nyMADGZ/7Tf0olncwe5p/bT5eUJL+Te2eIvTsEUJxFWr8HC3e9pl5aYuRh f4p4iqMZ0ZsLjEkNmennk9S5zpnvOegJKA2K1otC4dmg7K8nl1bB8D0+amVtm5dJjt/M HSAXC8nRGWh7QXwSpqw3lkXd1hLST//hTzVwnivITxeIlkMVQY83LfkXsjYzy+TSOu2G pZgnFmrTeYQLDhlcGoNz1IKraDBv2HqAfNU11yA2ovNnFw04k32bSYI/MMetWqZBhQ54 vEeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=G7LFMT8PulGemZuHLdo1sIzq6dsz2chBhX40nOkheAY=; b=By/drvo3F2Loe8KRbs2jS/f2Ebr7s2QuMqTX3CpuXlJTXv13fKdvpNb5EhW3y7d5c6 mTiLxWlBPlEfuHNeK2an9dfrgAme1kmwvkhrdTY4gp4FUzCLqDJnq0xPCT30y0IVn0VP 3aGGCFSMJGALY+HhVX9fe2aHDtl+zMu1kRe3lcGbWU8O5lq13nBnLOGf+1Aa/rinI8Vp bpWvkTJ/ax0fRySuEbZeyz22oVUGbBQaelbXHuLfVtE82ldh0ZIgWXFaWbwYj1UkB2ek RDwj+kdaDsnAj+ET3k9aA4O68M1Zz9g+gFmw4GQTd7UObn+aFTOfQeGGpaEYsiV5tsPn WdqQ== X-Gm-Message-State: APjAAAX+z5BDvKn1jh18ydfUnBS8nHa8jABIiYhEI2+ZnLXb7j5X9+fL bzo4B95KLBoLI1i8aq3OSYkbFw8CLEM= X-Google-Smtp-Source: APXvYqxHvjTU7Orua09GXoURSZS6fwepvZ0cqElRfXcuM9WjLHG1DwuaLjbPSHoddAD6yuvtOfCatw== X-Received: by 2002:aa7:9806:: with SMTP id e6mr25139406pfl.25.1573403115539; Sun, 10 Nov 2019 08:25:15 -0800 (PST) Received: from glados.lan ([2601:647:4c01:6541:fa16:54ff:fed1:1bd6]) by smtp.gmail.com with ESMTPSA id x186sm14350010pfx.105.2019.11.10.08.25.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2019 08:25:15 -0800 (PST) From: Thomas Hebb To: u-boot@lists.denx.de Date: Sun, 10 Nov 2019 08:25:08 -0800 Message-Id: <19e9869a413e658b6e05b2f7d32186f2cd0dc752.1573403105.git.tommyhebb@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 10 Nov 2019 17:09:30 +0000 Cc: Heinrich Schuchardt , Chris Packham Subject: [U-Boot] [PATCH 1/3] Makefile: don't try to construct CLEAN_FILES based on config 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" All of the clean targets (clean, dist-clean, mrproper) are run without loading a configuration. That means that any conditional modification of CLEAN_FILES will either always apply or never apply and so shouldn't be in a conditional in the first place. Since CLEAN_FILES is allowed to list nonexistent files, just add everything to it unconditionally to fix the issue. Signed-off-by: Thomas Hebb --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5c8c4c971f..1186a1d34c 100644 --- a/Makefile +++ b/Makefile @@ -1286,7 +1286,6 @@ MKIMAGEFLAGS_u-boot-ivt.img = -A $(ARCH) -T firmware_ivt -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" u-boot-ivt.img: MKIMAGEOUTPUT = u-boot-ivt.img.log -CLEAN_FILES += u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log endif MKIMAGEFLAGS_u-boot-dtb.img = $(MKIMAGEFLAGS_u-boot.img) @@ -1386,7 +1385,6 @@ lpc32xx-boot-1.bin: lpc32xx-spl.img FORCE lpc32xx-full.bin: lpc32xx-boot-0.bin lpc32xx-boot-1.bin u-boot.img FORCE $(call if_changed,cat) -CLEAN_FILES += lpc32xx-* endif OBJCOPYFLAGS_u-boot-with-tpl.bin = -I binary -O binary \ @@ -1900,7 +1898,9 @@ CLEAN_DIRS += $(MODVERDIR) \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h tools/version.h \ - boot* u-boot* MLO* SPL System.map fit-dtb.blob* + boot* u-boot* MLO* SPL System.map fit-dtb.blob* \ + u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ + lpc32xx-* # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include/generated spl tpl \