Patchwork [U-Boot,v3] mkconfig: start deprecating Makefile config targets

login
register
mail settings
Submitter Mike Frysinger
Date Oct. 1, 2011, 8:15 p.m.
Message ID <1317500104-1508-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/117279/
State Accepted
Commit 1285a2808a254f3d1a809c1a541f0c0f746e03d7
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - Oct. 1, 2011, 8:15 p.m.
Now that we've got boards.cfg and most people have converted over,
start warning people who have yet to so we can phase board configs
completely out of the Makefile.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v3
	- add an actual target for board removal

 doc/feature-removal-schedule.txt |   16 ++++++++++++++++
 mkconfig                         |    9 +++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
Wolfgang Denk - Oct. 5, 2011, 6:59 p.m.
Dear Mike Frysinger,

In message <1317500104-1508-1-git-send-email-vapier@gentoo.org> you wrote:
> Now that we've got boards.cfg and most people have converted over,
> start warning people who have yet to so we can phase board configs
> completely out of the Makefile.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> v3
> 	- add an actual target for board removal
> 
>  doc/feature-removal-schedule.txt |   16 ++++++++++++++++
>  mkconfig                         |    9 +++++++++
>  2 files changed, 25 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt
index 180ead5..13d7d9a 100644
--- a/doc/feature-removal-schedule.txt
+++ b/doc/feature-removal-schedule.txt
@@ -7,6 +7,22 @@  file.
 
 ---------------------------
 
+What:	boards with xxx_config targets in top level Makefile
+When:	Release v2012.03
+
+Why:	We have a boards.cfg file which the vast majority of boards have
+	converted over to.  Boards that still manually run mkconfig in the
+	top level Makefile are either dead, or the maintainer doesn't care,
+	or they are doing something weird/wrong that should be fixed in a
+	different way, or they need to extend boards.cfg syntax (unlikely).
+
+	In any case, if no one cares about these boards to figure out how
+	to make boards.cfg work, then we'll just punt them.
+
+Who:	Mike Frysinger <vapier@gentoo.org>
+
+---------------------------
+
 What:	CONFIG_NET_MULTI option
 When:	Release 2009-11
 
diff --git a/mkconfig b/mkconfig
index ecb6d4e..438530b 100755
--- a/mkconfig
+++ b/mkconfig
@@ -29,6 +29,15 @@  if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
 	set ${line}
 	# add default board name if needed
 	[ $# = 3 ] && set ${line} ${1}
+elif [ "${MAKEFLAGS+set}${MAKELEVEL+set}" = "setset" ] ; then
+	# only warn when using a config target in the Makefile
+	cat <<-EOF
+
+	warning: Please migrate to boards.cfg.  Failure to do so will
+	         mean removal of your board in the next release.
+
+	EOF
+	sleep 5
 fi
 
 while [ $# -gt 0 ] ; do