board: am43xx: Add maintainer information

[u-boot] / tools / moveconfig.py

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index a05c12b7e700972fe5417dc6f933d419efcf6746..496c90a9dc81dc70ff705bea9c1a727d8175ed16 100755 (executable)
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -153,6 +153,9 @@ Available options
    Specify the number of threads to run simultaneously.  If not specified,
    the number of threads is the same as the number of CPU cores.
 
    Specify the number of threads to run simultaneously.  If not specified,
    the number of threads is the same as the number of CPU cores.
 

+ -v, --verbose
+   Show any build errors as boards are built
+

 To see the complete list of supported options, run
 
   $ tools/moveconfig.py -h
 To see the complete list of supported options, run
 
   $ tools/moveconfig.py -h


@@ -348,11 +351,12 @@ def cleanup_headers(config_attrs, dry_run):
         patterns.append(re.compile(r'#\s*define\s+%s\W' % config))
         patterns.append(re.compile(r'#\s*undef\s+%s\W' % config))
 
         patterns.append(re.compile(r'#\s*define\s+%s\W' % config))
         patterns.append(re.compile(r'#\s*undef\s+%s\W' % config))
 

-    for (dirpath, dirnames, filenames) in os.walk('include'):
-        for filename in filenames:
-            if not fnmatch.fnmatch(filename, '*~'):
-                cleanup_one_header(os.path.join(dirpath, filename), patterns,
-                                   dry_run)
+    for dir in 'include', 'arch', 'board':
+        for (dirpath, dirnames, filenames) in os.walk(dir):
+            for filename in filenames:
+                if not fnmatch.fnmatch(filename, '*~'):
+                    cleanup_one_header(os.path.join(dirpath, filename),
+                                       patterns, dry_run)

 
 ### classes ###
 class KconfigParser:
 
 ### classes ###
 class KconfigParser:


@@ -555,7 +559,7 @@ class Slot:
                 pass
         shutil.rmtree(self.build_dir)
 
                 pass
         shutil.rmtree(self.build_dir)
 

-    def add(self, defconfig):
+    def add(self, defconfig, num, total):

         """Assign a new subprocess for defconfig and add it to the slot.
 
         If the slot is vacant, create a new subprocess for processing the
         """Assign a new subprocess for defconfig and add it to the slot.
 
         If the slot is vacant, create a new subprocess for processing the


@@ -572,9 +576,12 @@ class Slot:
             return False
         cmd = list(self.make_cmd)
         cmd.append(defconfig)
             return False
         cmd = list(self.make_cmd)
         cmd.append(defconfig)

-        self.ps = subprocess.Popen(cmd, stdout=self.devnull)
+        self.ps = subprocess.Popen(cmd, stdout=self.devnull,
+                                   stderr=subprocess.PIPE)

         self.defconfig = defconfig
         self.state = STATE_DEFCONFIG
         self.defconfig = defconfig
         self.state = STATE_DEFCONFIG

+        self.num = num
+        self.total = total

         return True
 
     def poll(self):
         return True
 
     def poll(self):


@@ -597,11 +604,21 @@ class Slot:
             return False
 
         if self.ps.poll() != 0:
             return False
 
         if self.ps.poll() != 0:

-
+            errmsg = 'Failed to process.'
+            errout = self.ps.stderr.read()
+            if errout.find('gcc: command not found') != -1:
+                errmsg = 'Compiler not found ('
+                errmsg += color_text(self.options.color, COLOR_YELLOW,
+                                     self.cross_compile)
+                errmsg += color_text(self.options.color, COLOR_LIGHT_RED,
+                                     ')')

             print >> sys.stderr, log_msg(self.options.color,
                                          COLOR_LIGHT_RED,
                                          self.defconfig,
             print >> sys.stderr, log_msg(self.options.color,
                                          COLOR_LIGHT_RED,
                                          self.defconfig,

-                                         "failed to process.")
+                                         errmsg),
+            if self.options.verbose:
+                print >> sys.stderr, color_text(self.options.color,
+                                                COLOR_LIGHT_CYAN, errout)

             if self.options.exit_on_error:
                 sys.exit("Exit on error.")
             else:
             if self.options.exit_on_error:
                 sys.exit("Exit on error.")
             else:


@@ -615,11 +632,14 @@ class Slot:
         if self.state == STATE_AUTOCONF:
             self.parser.update_defconfig(self.defconfig)
 
         if self.state == STATE_AUTOCONF:
             self.parser.update_defconfig(self.defconfig)
 

+            print ' %d defconfigs out of %d\r' % (self.num + 1, self.total),
+            sys.stdout.flush()
+

             """Save off the defconfig in a consistent way"""
             cmd = list(self.make_cmd)
             cmd.append('savedefconfig')
             self.ps = subprocess.Popen(cmd, stdout=self.devnull,
             """Save off the defconfig in a consistent way"""
             cmd = list(self.make_cmd)
             cmd.append('savedefconfig')
             self.ps = subprocess.Popen(cmd, stdout=self.devnull,

-                                       stderr=self.devnull)
+                                       stderr=subprocess.PIPE)

             self.state = STATE_SAVEDEFCONFIG
             return False
 
             self.state = STATE_SAVEDEFCONFIG
             return False
 


@@ -630,13 +650,17 @@ class Slot:
             self.state = STATE_IDLE
             return True
 
             self.state = STATE_IDLE
             return True
 

-        cross_compile = self.parser.get_cross_compile()
+        self.cross_compile = self.parser.get_cross_compile()

         cmd = list(self.make_cmd)
         cmd = list(self.make_cmd)

-        if cross_compile:
-            cmd.append('CROSS_COMPILE=%s' % cross_compile)
+        if self.cross_compile:
+            cmd.append('CROSS_COMPILE=%s' % self.cross_compile)

         cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
         cmd.append('include/config/auto.conf')
         cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
         cmd.append('include/config/auto.conf')

-        self.ps = subprocess.Popen(cmd, stdout=self.devnull)
+        """This will be screen-scraped, so be sure the expected text will be
+        returned consistently on every machine by setting LANG=C"""
+        self.ps = subprocess.Popen(cmd, stdout=self.devnull,
+                                   env=dict(os.environ, LANG='C'),
+                                   stderr=subprocess.PIPE)

         self.state = STATE_AUTOCONF
         return False
 
         self.state = STATE_AUTOCONF
         return False
 


@@ -664,7 +688,7 @@ class Slots:
         for i in range(options.jobs):
             self.slots.append(Slot(config_attrs, options, devnull, make_cmd))
 
         for i in range(options.jobs):
             self.slots.append(Slot(config_attrs, options, devnull, make_cmd))
 

-    def add(self, defconfig):
+    def add(self, defconfig, num, total):

         """Add a new subprocess if a vacant slot is found.
 
         Arguments:
         """Add a new subprocess if a vacant slot is found.
 
         Arguments:


@@ -674,7 +698,7 @@ class Slots:
           Return True on success or False on failure
         """
         for slot in self.slots:
           Return True on success or False on failure
         """
         for slot in self.slots:

-            if slot.add(defconfig):
+            if slot.add(defconfig, num, total):

                 return True
         return False
 
                 return True
         return False
 


@@ -715,6 +739,10 @@ class Slots:
                 print >> sys.stderr, color_text(self.options.color,
                                                 COLOR_LIGHT_RED, line)
 
                 print >> sys.stderr, color_text(self.options.color,
                                                 COLOR_LIGHT_RED, line)
 

+            with open('moveconfig.failed', 'w') as f:
+                for board in failed_boards:
+                    f.write(board + '\n')
+

 def move_config(config_attrs, options):
     """Move config options to defconfig files.
 
 def move_config(config_attrs, options):
     """Move config options to defconfig files.
 


@@ -754,8 +782,8 @@ def move_config(config_attrs, options):
     # Main loop to process defconfig files:
     #  Add a new subprocess into a vacant slot.
     #  Sleep if there is no available slot.
     # Main loop to process defconfig files:
     #  Add a new subprocess into a vacant slot.
     #  Sleep if there is no available slot.

-    for defconfig in defconfigs:
-        while not slots.add(defconfig):
+    for i, defconfig in enumerate(defconfigs):
+        while not slots.add(defconfig, i, len(defconfigs)):

             while not slots.available():
                 # No available slot: sleep for a while
                 time.sleep(SLEEP_TIME)
             while not slots.available():
                 # No available slot: sleep for a while
                 time.sleep(SLEEP_TIME)


@@ -764,6 +792,7 @@ def move_config(config_attrs, options):
     while not slots.empty():
         time.sleep(SLEEP_TIME)
 
     while not slots.empty():
         time.sleep(SLEEP_TIME)
 

+    print ''

     slots.show_failed_boards()
 
 def bad_recipe(filename, linenum, msg):
     slots.show_failed_boards()
 
 def bad_recipe(filename, linenum, msg):


@@ -858,6 +887,8 @@ def main():
                       help='only cleanup the headers')
     parser.add_option('-j', '--jobs', type='int', default=cpu_count,
                       help='the number of jobs to run simultaneously')
                       help='only cleanup the headers')
     parser.add_option('-j', '--jobs', type='int', default=cpu_count,
                       help='the number of jobs to run simultaneously')

+    parser.add_option('-v', '--verbose', action='store_true', default=False,
+                      help='show any build errors as boards are built')

     parser.usage += ' recipe_file\n\n' + \
                     'The recipe_file should describe config options you want to move.\n' + \
                     'Each line should contain config_name, type, default_value\n\n' + \
     parser.usage += ' recipe_file\n\n' + \
                     'The recipe_file should describe config options you want to move.\n' + \
                     'Each line should contain config_name, type, default_value\n\n' + \