diff options
| author | Heiko Schocher <hs@denx.de> | 2016-02-17 18:32:51 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-24 18:44:00 -0500 |
| commit | b1309a23e0e5eca1d980e4d88080d02f2d36219f (patch) | |
| tree | 7736404784e54246f6e7d885f9bd4f817e7e00b3 /test/py | |
| parent | ed48899c1173cf0767d85f389650f544ce846006 (diff) | |
| download | u-boot-imx-b1309a23e0e5eca1d980e4d88080d02f2d36219f.zip u-boot-imx-b1309a23e0e5eca1d980e4d88080d02f2d36219f.tar.gz u-boot-imx-b1309a23e0e5eca1d980e4d88080d02f2d36219f.tar.bz2 | |
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>
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/u_boot_console_base.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index bc2bd76..d6502c6 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]) |