From 2a9987935e3cdb61e7550c87cbc9f500a54f672d Mon Sep 17 00:00:00 2001 From: Daniel Hobi Date: Mon, 18 Jan 2010 18:13:39 +0100 Subject: Makefile: fix parallel build During parallel build, the top Makefile spawns multiple sub-makes for targets in cpu/$(CPU) and $(dir $(LDSCRIPT)). If the .depend files are not present in these directories, the sub-makes may end up generating these files simultaneously which leads to corrupted content. A typical error message is: .depend:39: *** multiple target patterns. Stop. This patch serializes the creation of .depend in cpu/$(CPU) and $(dir $(LDSCRIPT)) by adding these directories to the depend target in the top Makefile. Other directories in $(LIBS) are not affected since they contain only one Make target and thus only one sub-make is spawned per directory. Signed-off-by: Daniel Hobi Signed-off-by: Mike Frysinger --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 793fcec..1ab197b 100644 --- a/Makefile +++ b/Makefile @@ -398,8 +398,11 @@ updater: env: $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1 +# Explicitly make _depend in subdirs containing multiple targets to prevent +# parallel sub-makes creating .depend files simultaneously. depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk - for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done + for dir in $(SUBDIRS) cpu/$(CPU) $(dir $(LDSCRIPT)) ; do \ + $(MAKE) -C $$dir _depend ; done TAG_SUBDIRS = $(SUBDIRS) TAG_SUBDIRS += $(dir $(__LIBS)) -- cgit v1.1 From 34be10651704709dfb35f9c57013f02d47cced09 Mon Sep 17 00:00:00 2001 From: Matthias Weisser Date: Mon, 18 Jan 2010 10:58:13 +0100 Subject: Removing Atmel from ARM926EJ-S Systems Signed-off-by: Matthias Weisser --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1ab197b..96a00d4 100644 --- a/Makefile +++ b/Makefile @@ -2706,7 +2706,7 @@ mp2usb_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t mp2usb NULL at91rm9200 ######################################################################### -## Atmel ARM926EJ-S Systems +## ARM926EJ-S Systems ######################################################################### afeb9260_config: unconfig -- cgit v1.1 From c7c0d542a199089cf658a7c23c314a5cff248b00 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Jan 2010 04:03:22 -0500 Subject: tools: allow people to compile w/out configuring It's useful to be able to build up the host tools without having to select a board first. Pretty much all tools in there are config-independent anyways. Also add a shortcut "tools-all" to quickly build all host tools that are actually config-independent to allow for simple test builds. Signed-off-by: Mike Frysinger --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 96a00d4..2403ad9 100644 --- a/Makefile +++ b/Makefile @@ -451,10 +451,15 @@ $(obj)include/autoconf.mk: $(obj)include/config.h 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 \ -$(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) gdbtools \ +updater env 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 endif # config.mk .PHONY : CHANGELOG -- cgit v1.1