diff options
author | Corentin LABBE <clabbe@baylibre.com> | 2019-06-25 09:40:41 +0200 |
---|---|---|
committer | Corentin LABBE <clabbe@baylibre.com> | 2019-06-25 09:40:41 +0200 |
commit | 18278de8fb3e613115f21b6f02cedc191e6a791e (patch) | |
tree | 1ac5aa48250ad4138fe58d32fb63b455bdde7d60 | |
parent | b9e4d31719373b52c7113d0e8a960332fd8ef8c6 (diff) |
lavalab-gen.py: Do not use ser2net when connection_command is set
When a custom way of getting serial is set, we should not defaulting to
ser2net.
This is the case for hsdk which use a spetial console handler via connection_command.
-rwxr-xr-x | lavalab-gen.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lavalab-gen.py b/lavalab-gen.py index 0e8c018..b3f096a 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -573,7 +573,7 @@ def main(): if (use_conmux and use_ser2net) or (use_conmux and use_screen) or (use_screen and use_ser2net): print("ERROR: Only one uart handler must be configured") sys.exit(1) - if not use_conmux and not use_screen and not use_ser2net: + if not use_conmux and not use_screen and not use_ser2net and not "connection_command" in board: use_ser2net = True if use_conmux: conmuxline = template_conmux.substitute(board=board_name, baud=baud) @@ -601,7 +601,7 @@ def main(): fp = open("%s/lava-screen.conf" % workerdir, "a") fp.write("%s\n" % board_name) fp.close() - elif "connection_command" in board: + if "connection_command" in board: connection_command = board["connection_command"] device_line += template_device_connection_command.substitute(connection_command=connection_command) if "uboot_ipaddr" in board: |