[U-Boot,1/3] Makefile: don't try to construct CLEAN_FILES based on config
diff mbox series

Message ID 19e9869a413e658b6e05b2f7d32186f2cd0dc752.1573403105.git.tommyhebb@gmail.com
State Accepted
Commit 57297e605a06b69129da63b17f1b76fb53a84b3f
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,1/3] Makefile: don't try to construct CLEAN_FILES based on config
Related show

Commit Message

Thomas Hebb Nov. 10, 2019, 4:25 p.m. UTC
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 <tommyhebb@gmail.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini Dec. 4, 2019, 4:01 a.m. UTC | #1
On Sun, Nov 10, 2019 at 08:25:08AM -0800, Thomas Hebb wrote:

> 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 <tommyhebb@gmail.com>

Applied to u-boot/master, thanks!

Patch
diff mbox series

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 \