summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-26 18:05:45 +0900
committerTom Rini <trini@ti.com>2013-12-13 09:17:32 -0500
commit93f70dfd58ff0c291c88af57785f131d534d5559 (patch)
tree8035c20ba65ed40236e9ef50920f1c11102d47e8
parentde04d64eda42490f94d638e8ee2e12e494e80417 (diff)
downloadu-boot-imx-93f70dfd58ff0c291c88af57785f131d534d5559.zip
u-boot-imx-93f70dfd58ff0c291c88af57785f131d534d5559.tar.gz
u-boot-imx-93f70dfd58ff0c291c88af57785f131d534d5559.tar.bz2
.gitignore: ignore spl/ and tpl/ directories except spl/Makefile
Before this commit, output files under tpl/ directry were not ignored. This commit fixes this problem. And we have only one source file under spl/ directory: spl/Makefile So, we can describe .gitignore more simply. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--.gitignore7
-rw-r--r--spl/.gitignore4
2 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index a39bd54..a1f07f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,6 +59,10 @@
/errlog
/reloc_off
+/spl/
+!/spl/Makefile
+/tpl/
+
/include/generated/
/include/spl-autoconf.mk
/include/tpl-autoconf.mk
@@ -88,6 +92,3 @@ GPATH
GRTAGS
GSYMS
GTAGS
-
-# spl ais files
-/spl/*.ais
diff --git a/spl/.gitignore b/spl/.gitignore
deleted file mode 100644
index 7c88147..0000000
--- a/spl/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-u-boot-spl
-u-boot-spl.bin
-u-boot-spl.lds
-u-boot-spl.map