diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-06-09 15:14:11 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-11 16:27:05 -0400 |
| commit | c71630838d908e410ee83f0164327e1fd515f1ca (patch) | |
| tree | 689df7a159cfda3e03c66063523bcaaf90281e0d | |
| parent | ddc94378db9fe0c9076512768b3576e0fdc580dd (diff) | |
| download | u-boot-c71630838d908e410ee83f0164327e1fd515f1ca.tar.gz | |
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>
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | scripts/Makefile.spl (renamed from spl/Makefile) | 0 |
3 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 4e4fd00c2f..2ddf57f2a5 100644 --- a/.gitignore +++ b/.gitignore @@ -49,8 +49,7 @@ /errlog /reloc_off -/spl/* -!/spl/Makefile +/spl/ /tpl/ # @@ -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' diff --git a/spl/Makefile b/scripts/Makefile.spl index bf677aa42a..bf677aa42a 100644 --- a/spl/Makefile +++ b/scripts/Makefile.spl |