Skip to content

Commit c716308

Browse files
masahir0ytrini
authored andcommitted
kbuild: move spl/Makefile to scripts/Makefile.spl
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>
1 parent ddc9437 commit c716308

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
/errlog
5050
/reloc_off
5151

52-
/spl/*
53-
!/spl/Makefile
52+
/spl/
5453
/tpl/
5554

5655
#

Makefile

+3-5
Original file line numberDiff line numberDiff line change
@@ -1128,13 +1128,13 @@ u-boot.lds: $(LDSCRIPT) prepare FORCE
11281128
spl/u-boot-spl.bin: spl/u-boot-spl
11291129
@:
11301130
spl/u-boot-spl: tools prepare
1131-
$(Q)$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
1131+
$(Q)$(MAKE) obj=spl -f $(srctree)/scripts/Makefile.spl all
11321132

11331133
spl/sunxi-spl.bin: spl/u-boot-spl
11341134
@:
11351135

11361136
tpl/u-boot-tpl.bin: tools prepare
1137-
$(Q)$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
1137+
$(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all CONFIG_TPL_BUILD=y
11381138

11391139
TAG_SUBDIRS := $(u-boot-dirs) include
11401140

@@ -1214,9 +1214,7 @@ CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \
12141214
include/tpl-autoconf.mk
12151215

12161216
# Directories & files removed with 'make clobber'
1217-
CLOBBER_DIRS += $(patsubst %,spl/%, $(filter-out Makefile, \
1218-
$(shell ls -1 spl 2>/dev/null))) \
1219-
tpl
1217+
CLOBBER_DIRS += spl tpl
12201218
CLOBBER_FILES += u-boot* MLO* SPL System.map
12211219

12221220
# Directories & files removed with 'make mrproper'
File renamed without changes.

0 commit comments

Comments
 (0)