From b1309a23e0e5eca1d980e4d88080d02f2d36219f Mon Sep 17 00:00:00 2001
From: Heiko Schocher <hs@denx.de>
Date: Wed, 17 Feb 2016 18:32:51 +0100
Subject: [PATCH] test/py: only check for SPL signature if SPL uses serial
output
check for U-Boot SPL signature only if SPL really has a serial output.
So check if CONFIG_SPL_SERIAL_SUPPORT is active in board config.
Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
---
test/py/u_boot_console_base.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index bc2bd767e4..d6502c6e64 100644
--- a/test/py/u_boot_console_base.py
+++ b/test/py/u_boot_console_base.py
@@ -303,8 +303,13 @@ 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':
- m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns)
+ bcfg = self.config.buildconfig
+ config_spl = bcfg.get('config_spl', 'n') == 'y'
+ config_spl_serial_support = bcfg.get('config_spl_serial_support',
+ 'n') == 'y'
+ if config_spl and config_spl_serial_support:
+ m = self.p.expect([pattern_u_boot_spl_signon] +
+ self.bad_patterns)
if m != 0:
raise Exception('Bad pattern found on console: ' +
self.bad_pattern_ids[m - 1])
--
2.39.5