aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada2014-06-16 04:56:38 -0500
committerTom Rini2014-06-20 10:56:26 -0500
commit45f0ad9545578b4436fdf04ba25a10173bcb75ef (patch)
treed94bf0cb3b4559fa97d5993d861b3bbfdbe2890f /Makefile
parent9e546ee9c90fc0a888423fa3269020fe736df7a3 (diff)
downloadu-boot-45f0ad9545578b4436fdf04ba25a10173bcb75ef.tar.gz
u-boot-45f0ad9545578b4436fdf04ba25a10173bcb75ef.tar.xz
u-boot-45f0ad9545578b4436fdf04ba25a10173bcb75ef.zip
cosmetic: kbuild: clean-up coding style (sync with Linux 3.16-rc1)
Import the following trivial commits from Linux v3.16-rc1: bb66fc6 kbuild: trivial - use tabs for code indent where possible 7eb6e34 kbuild: trivial - remove trailing empty lines 3fbb43d kbuild: trivial - fix comment block indent 38385f8 kbuild: trivial - remove trailing spaces Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 8436fda717..e429212228 100644
--- a/Makefile
+++ b/Makefile
@@ -244,18 +244,18 @@ endif
244KBUILD_MODULES := 244KBUILD_MODULES :=
245KBUILD_BUILTIN := 1 245KBUILD_BUILTIN := 1
246 246
247# If we have only "make modules", don't compile built-in objects. 247# If we have only "make modules", don't compile built-in objects.
248# When we're building modules with modversions, we need to consider 248# When we're building modules with modversions, we need to consider
249# the built-in objects during the descend as well, in order to 249# the built-in objects during the descend as well, in order to
250# make sure the checksums are up to date before we record them. 250# make sure the checksums are up to date before we record them.
251 251
252ifeq ($(MAKECMDGOALS),modules) 252ifeq ($(MAKECMDGOALS),modules)
253 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1) 253 KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
254endif 254endif
255 255
256# If we have "make <whatever> modules", compile modules 256# If we have "make <whatever> modules", compile modules
257# in addition to whatever we do anyway. 257# in addition to whatever we do anyway.
258# Just "make" or "make all" shall build modules as well 258# Just "make" or "make all" shall build modules as well
259 259
260# U-Boot does not need modules 260# U-Boot does not need modules
261#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),) 261#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
@@ -1219,7 +1219,7 @@ CLOBBER_FILES += u-boot* MLO* SPL System.map
1219 1219
1220# Directories & files removed with 'make mrproper' 1220# Directories & files removed with 'make mrproper'
1221MRPROPER_DIRS += include/config include/generated \ 1221MRPROPER_DIRS += include/config include/generated \
1222 .tmp_objdiff 1222 .tmp_objdiff
1223MRPROPER_FILES += .config .config.old \ 1223MRPROPER_FILES += .config .config.old \
1224 tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ 1224 tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
1225 include/config.h include/config.mk 1225 include/config.h include/config.mk