[U-Boot] [PATCH] Makefile: restore support for board shortcut targets
The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that.
When cleaning things up, the top level gitignore file ignores all things that end with ".depend", but the clean target only deletes files that are named exactly ".depend". Keep these in sync by having the clean target punt all files that match the pattern that gitignore is using.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile index 4f1cb1b..f9eb4a2 100644 --- a/Makefile +++ b/Makefile @@ -487,8 +487,9 @@ unconfig: %_config:: unconfig @$(MKCONFIG) -A $(@:_config=)
-##%: %_config -## $(MAKE) +sinclude .boards.depend +.boards.depend: boards.cfg + awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@
# # Functions to generate common board directory names @@ -2468,7 +2469,7 @@ clean: | xargs rm -f
clobber: clean - @find $(OBJTREE) -type f ( -name .depend \ + @find $(OBJTREE) -type f ( -name '*.depend' \ -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img ) \ -print0 \ | xargs -0 rm -f
On Wed, Aug 11, 2010 at 6:52 PM, Mike Frysinger wrote:
The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that.
hmm, i guess boards.cfg doesnt contain 100% of the boards as it doesnt support the ones that use the -t option to mkconfig or other exotic things, but i think this patch is still good to go -mike
Hi Mike,
On Wed, Aug 11, 2010 at 6:52 PM, Mike Frysinger wrote:
The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that.
hmm, i guess boards.cfg doesnt contain 100% of the boards as it doesnt support the ones that use the -t option to mkconfig or other exotic things, but i think this patch is still good to go
Yep, the generalization of the "-t" construct for boards.cfg is still missing. This will end up by being one entry in boards.cfg for all supported targets and then "-t" for mkconfig can go away.
So yes, the patch is good.
Wolfgang, what was our last idea that "-t" construct? Unfortunately I cannot remember...
Acked-by: Detlev Zundel dzu@denx.de
Dear Mike Frysinger,
In message 1281567156-30325-1-git-send-email-vapier@gentoo.org you wrote:
The helpful shortcut for doing a board config + make was dropped recently as it conflicted with some new build code. However, the reason for using pattern targets originally was to avoid managing a duplicate list of boards. Since we now have one centralized place for a list of boards (the new boards.cfg), we don't need a pattern target -- we can generate the exact list of boards on the fly. So do just that.
When cleaning things up, the top level gitignore file ignores all things that end with ".depend", but the clean target only deletes files that are named exactly ".depend". Keep these in sync by having the clean target punt all files that match the pattern that gitignore is using.
Signed-off-by: Mike Frysinger vapier@gentoo.org
Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
Applied to "next" branch.
Best regards,
Wolfgang Denk
participants (3)
-
Detlev Zundel -
Mike Frysinger -
Wolfgang Denk