]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
kbuild: move spl/Makefile to scripts/Makefile.spl
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Mon, 9 Jun 2014 06:14:11 +0000 (15:14 +0900)
committerTom Rini <trini@ti.com>
Wed, 11 Jun 2014 20:27:05 +0000 (16:27 -0400)
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@jp.panasonic.com>
.gitignore
Makefile
scripts/Makefile.spl [moved from spl/Makefile with 100% similarity]

index 4e4fd00c2f98b7403072e5aaa61afa95e5dd78f9..2ddf57f2a55bf8eb295339fcf3cdbebb0892849b 100644 (file)
@@ -49,8 +49,7 @@
 /errlog
 /reloc_off
 
-/spl/*
-!/spl/Makefile
+/spl/
 /tpl/
 
 #
index a52296831a61d2a6f5c772bc62adaa0f847645af..24d96877ac60536e9ac8adbdf6341b1141c96bd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1128,13 +1128,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
 
@@ -1214,9 +1214,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'
similarity index 100%
rename from spl/Makefile
rename to scripts/Makefile.spl