Makefile: remove generated boards.cfg within make distclean

Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>

diff --git a/MAKEALL b/MAKEALL
index 929fe884c54d73b2f7ca2badb807c75fca9d42fc..392ea8d2aeeb31ed5b46c2e3f7683aa501cdfbf0 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -658,7 +658,7 @@ build_target() {
                MAKE="${MAKE} O=${output_dir}"
        fi
 
-       ${MAKE} distclean >/dev/null
+       ${MAKE} mrproper >/dev/null
 
        echo "Building ${target} board..."
        ${MAKE} -s ${target}_defconfig >/dev/null

diff --git a/Makefile b/Makefile
index b5b3560dacc9be1b5b35afb0385be761e5bc2ce3..0f82fc2d3b3f4fdb7893c5c53d70739bb1915c12 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1289,6 +1289,7 @@ distclean: mrproper
                -o -name '.*.rej' -o -name '*%' -o -name 'core' \
                -o -name '*.pyc' \) \
                -type f -print | xargs rm -f
+       @rm -f boards.cfg
 
 backup:
        F=`basename $(srctree)` ; cd .. ; \

diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index d5b8454c08462c37d8a933404aa5f31450eb026c..a555bd81fc4826dffe410b0fc87996437f4abbd8 100644 (file)
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -308,7 +308,7 @@ class Builder:
         Args:
             commit: Commit object that is being built
             brd: Board object that is being built
-            stage: Stage that we are at (distclean, config, build)
+            stage: Stage that we are at (mrproper, config, build)
             cwd: Directory where make should be run
             args: Arguments to pass to make
             kwargs: Arguments to pass to command.RunPipe()

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 32297e20e8f04814083cb355a7d6106c1383ae85..8214662e368890d05bc1017c15adc9acb430031f 100644 (file)
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -91,7 +91,7 @@ class BuilderThread(threading.Thread):
             commit: Commit object that is being built
             brd: Board object that is being built
             stage: Stage of the build. Valid stages are:
-                        distclean - can be called to clean source
+                        mrproper - can be called to clean source
                         config - called to configure for a board
                         build - the main make invocation - it does the build
             args: A list of arguments to pass to 'make'
@@ -200,8 +200,8 @@ class BuilderThread(threading.Thread):
 
                 # If we need to reconfigure, do that now
                 if do_config:
-                    result = self.Make(commit, brd, 'distclean', cwd,
-                            'distclean', *args, env=env)
+                    result = self.Make(commit, brd, 'mrproper', cwd,
+                            'mrproper', *args, env=env)
                     result = self.Make(commit, brd, 'config', cwd,
                             *(args + config_args), env=env)
                     config_out = result.combined