buildman: Keep more outputs with the --keep-outputs flag

When told to keep outputs, be much more liberal in what files we keep.
In addition to adding 'MLO', keep anything that matches u-boot-spl.* (so
that we keep the map file as well) and anything we generate about
'u-boot itself.  A large number of bootable formats now match this and
thus it's easier to build many targets and then boot them afterwards
using buildman.

Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 7384a72be6da497e4e37c0a87c929fc1a5d6e38b..b4cfdeee08c60079c9cfca193d441faa8c15090f 100644 (file)
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -353,10 +353,9 @@ class BuilderThread(threading.Thread):
 
         # Now write the actual build output
         if keep_outputs:
 
         # Now write the actual build output
         if keep_outputs:

-            self.CopyFiles(result.out_dir, build_dir, '', ['u-boot', '*.bin',
-                    'u-boot.dtb', '*.map', '*.img',
-                    'spl/u-boot-spl', 'spl/u-boot-spl.bin',
-                    'tpl/u-boot-tpl', 'tpl/u-boot-tpl.bin'])
+            self.CopyFiles(result.out_dir, build_dir, '', ['u-boot*', '*.bin',
+                '*.map', '*.img', 'MLO', 'include/autoconf.mk',
+                'spl/u-boot-spl*'])

 
     def CopyFiles(self, out_dir, build_dir, dirname, patterns):
         """Copy files from the build directory to the output.
 
     def CopyFiles(self, out_dir, build_dir, dirname, patterns):
         """Copy files from the build directory to the output.