unify toplevel tools targets
Most tool subdirs do not rely on a configured tree, so move those targets
out of the config checks and unify them in the process.
Also add an easylogo target so people can easily build that.
Also add these new tool targets to the 'tools-all' target.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
diff --git a/Makefile b/Makefile
index f06d751..84947d0 100644
--- a/Makefile
+++ b/Makefile
@@ -404,14 +404,8 @@
@LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
@LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
-gdbtools:
- $(MAKE) -C tools/gdb all || exit 1
-
updater:
- $(MAKE) -C tools/updater all || exit 1
-
-env:
- $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1
+ $(MAKE) -C tools/updater all
# Explicitly make _depend in subdirs containing multiple targets to prevent
# parallel sub-makes creating .depend files simultaneously.
@@ -466,17 +460,22 @@
else # !config.mk
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
$(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \
-$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) gdbtools \
-updater env depend dep tags ctags etags cscope $(obj)System.map:
+$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) $(VERSION_FILE) \
+updater depend dep tags ctags etags cscope $(obj)System.map:
@echo "System not configured - see README" >&2
@ exit 1
tools:
- $(MAKE) -C tools
-tools-all:
- $(MAKE) -C tools HOST_TOOLS_ALL=y
+ $(MAKE) -C $@ all
endif # config.mk
+easylogo env gdb:
+ $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION}
+gdbtools: gdb
+
+tools-all: easylogo env gdb
+ $(MAKE) -C tools HOST_TOOLS_ALL=y
+
.PHONY : CHANGELOG
CHANGELOG:
git log --no-merges U-Boot-1_1_5.. | \