]> git.sur5r.net Git - u-boot/blobdiff - test/py/u_boot_console_base.py
ARM: at91: sama5d2: configure the L2 cache memory
[u-boot] / test / py / u_boot_console_base.py
index 7e1e9d430ffa780e45cf87c35ebd8b4872914da1..bc2bd767e40e32da0a56e4963f7bd50aece8a6bd 100644 (file)
@@ -293,8 +293,8 @@ class ConsoleBase(object):
         if self.p:
             return
         try:
+            self.log.start_section('Starting U-Boot')
             self.at_prompt = False
-            self.log.action('Starting U-Boot')
             self.p = self.get_spawn()
             # Real targets can take a long time to scroll large amounts of
             # text if LCD is enabled. This value may need tweaking in the
@@ -303,7 +303,7 @@ class ConsoleBase(object):
             if not self.config.gdbserver:
                 self.p.timeout = 30000
             self.p.logfile_read = self.logstream
-            if self.config.buildconfig.get('CONFIG_SPL', False) == 'y':
+            if self.config.buildconfig.get('config_spl', False) == 'y':
                 m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns)
                 if m != 0:
                     raise Exception('Bad pattern found on console: ' +
@@ -329,6 +329,8 @@ class ConsoleBase(object):
             self.log.error(str(ex))
             self.cleanup_spawn()
             raise
+        finally:
+            self.log.end_section('Starting U-Boot')
 
     def cleanup_spawn(self):
         """Shut down all interaction with the U-Boot instance.