summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:36:01 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:32 -0500
commitbc8bb6ec0af8e7a14e9a50057504263e7127aa73 (patch)
tree3b693910932961cc082e370aa070a7d6280dc64f
parente2906a5943f6a1a9e0d7ea2c71e605b88ee17ef0 (diff)
Makefile: refactor a little
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile4
-rw-r--r--spl/Makefile3
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1389ee773e1..e28878bf8d5 100644
--- a/Makefile
+++ b/Makefile
@@ -65,11 +65,9 @@ endif
# the object files are placed in the source directory.
#
-ifdef O
ifeq ("$(origin O)", "command line")
BUILD_DIR := $(O)
endif
-endif
# Call a source code checker (by default, "sparse") as part of the
# C compilation.
@@ -614,7 +612,7 @@ SYSTEM_MAP = \
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
LC_ALL=C sort
$(obj)System.map: $(obj)u-boot
- @$(call SYSTEM_MAP,$<) > $(obj)System.map
+ @$(call SYSTEM_MAP,$<) > $@
checkthumb:
@if test $(call cc-version) -lt 0404; then \
diff --git a/spl/Makefile b/spl/Makefile
index 29354f920ce..5bc75b4bcea 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -166,8 +166,7 @@ all: $(ALL-y)
ifdef CONFIG_SAMSUNG
$(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin
- $(OBJTREE)/tools/mk$(BOARD)spl \
- $(obj)u-boot-spl.bin $(obj)$(BOARD)-spl.bin
+ $(OBJTREE)/tools/mk$(BOARD)spl $< $@
endif
$(obj)$(SPL_BIN).bin: $(obj)$(SPL_BIN)