[U-Boot] [PATCH] kbuild: move spl/Makefile to scripts/Makefile.spl

Masahiro Yamada yamada.m at jp.panasonic.com
Mon Jun 9 08:14:11 CEST 2014


All files under spl/ and tpl/ are generated during the build process
except spl/Makefile.

We can simplify clean-rule and git-ignore by moving spl/Makefile
to somewhere else.

Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
---
By the way, scripts/Makefile.spl shall be merged into
other makefiles in future.

This file is too special for SPL and TPL and
looks really ugly.

Treating them in a more generic way would be better.


 .gitignore                           | 3 +--
 Makefile                             | 8 +++-----
 spl/Makefile => scripts/Makefile.spl | 0
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename spl/Makefile => scripts/Makefile.spl (100%)

diff --git a/.gitignore b/.gitignore
index 4e4fd00..2ddf57f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,8 +49,7 @@
 /errlog
 /reloc_off
 
-/spl/*
-!/spl/Makefile
+/spl/
 /tpl/
 
 #
diff --git a/Makefile b/Makefile
index 87d3e88..deafc03 100644
--- a/Makefile
+++ b/Makefile
@@ -1144,13 +1144,13 @@ u-boot.lds: $(LDSCRIPT) prepare FORCE
 spl/u-boot-spl.bin: spl/u-boot-spl
 	@:
 spl/u-boot-spl: tools prepare
-	$(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
+	$(Q)$(MAKE) obj=spl -f $(srctree)/scripts/Makefile.spl all
 
 spl/sunxi-spl.bin: spl/u-boot-spl
 	@:
 
 tpl/u-boot-tpl.bin: tools prepare
-	$(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
+	$(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all CONFIG_TPL_BUILD=y
 
 TAG_SUBDIRS := $(u-boot-dirs) include
 
@@ -1230,9 +1230,7 @@ CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \
 	       include/tpl-autoconf.mk
 
 # Directories & files removed with 'make clobber'
-CLOBBER_DIRS  += $(patsubst %,spl/%, $(filter-out Makefile, \
-		 $(shell ls -1 spl 2>/dev/null))) \
-		 tpl
+CLOBBER_DIRS  += spl tpl
 CLOBBER_FILES += u-boot* MLO* SPL System.map
 
 # Directories & files removed with 'make mrproper'
diff --git a/spl/Makefile b/scripts/Makefile.spl
similarity index 100%
rename from spl/Makefile
rename to scripts/Makefile.spl
-- 
1.9.1



More information about the U-Boot mailing list