sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-22 12:58:36 +00:00
Code Issues Releases Wiki Activity

juno: Removed default bootargs

Browse Source 
The default boot args have been removed since these cause issues with
the latest Linaro builds, which boot correctly without any bootargs.

Also made a regex string a raw-string.
This commit is contained in:
Sebastian Goscik 2016-05-03 15:00:40 +01:00
parent 6c4d88ff57
commit 59066cb46d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wlauto/devices/android/juno/__init__.py
View File

@ -81,9 +81,7 @@ class Juno(BigLittleDevice):
'fdt_support': True, 'fdt_support': True,
} }
), ),
Parameter('bootargs', default='console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 ' Parameter('bootargs',
'verbose debug init=/init root=/dev/sda1 rw ip=dhcp '
'rootwait video=DVI-D-1:1920x1080R@60',
description='''Default boot arguments to use when boot_arguments were not.'''), description='''Default boot arguments to use when boot_arguments were not.'''),
] ]
@ -158,7 +156,7 @@ class Juno(BigLittleDevice):
target.sendline('ip addr list eth0') target.sendline('ip addr list eth0')
time.sleep(1) time.sleep(1)
try: try:
target.expect('inet ([1-9]\d*.\d+.\d+.\d+)', timeout=10) target.expect(r'inet ([1-9]\d*.\d+.\d+.\d+)', timeout=10)
self.adb_name = target.match.group(1) + ':5555' # pylint: disable=W0201 self.adb_name = target.match.group(1) + ':5555' # pylint: disable=W0201
break break
except pexpect.TIMEOUT: except pexpect.TIMEOUT: