diff options
| author | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:08:34 +0900 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2021-01-25 11:16:06 +0900 |
| commit | 2261352157a932717ec08b9dd18d1bfbb7c37c52 (patch) | |
| tree | b48a3ea4060a7d078aecb97de07597a8eb24467a /tools/testing/kunit/kunit_kernel.py | |
| parent | drivers/soc/litex: Add restart handler (diff) | |
| parent | openrisc: io: Add missing __iomem annotation to iounmap() (diff) | |
| download | linux-2261352157a932717ec08b9dd18d1bfbb7c37c52.tar.gz linux-2261352157a932717ec08b9dd18d1bfbb7c37c52.zip | |
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'tools/testing/kunit/kunit_kernel.py')
| -rw-r--r-- | tools/testing/kunit/kunit_kernel.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 57c1724b7e5d..698358c9c0d6 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -198,7 +198,7 @@ class LinuxSourceTree(object): return self.validate_config(build_dir) def run_kernel(self, args=[], build_dir='', timeout=None): - args.extend(['mem=1G']) + args.extend(['mem=1G', 'console=tty']) self._ops.linux_bin(args, timeout, build_dir) outfile = get_outfile_path(build_dir) subprocess.call(['stty', 'sane']) |