LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/py: remove hacks for non-zero RAM base address in tests 

Some functions have different behaviour when the given address is 0
(assumed to be NULL by the function).

find_ram_base() does not return 0 anymore so it's safe to remove those
offsets.

Suggested-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Quentin Schulz 2018-07-09 19:16:27 +02:00 committed by Tom Rini
parent abba76354a
commit f4eef40b01
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/py/tests/test_efi_loader.py
View File

@ -118,7 +118,7 @@ def fetch_tftp_file(u_boot_console, env_conf):
addr = f.get('addr', None) addr = f.get('addr', None)
if not addr: if not addr:
addr = u_boot_utils.find_ram_base(u_boot_console) + (1024 * 1024 * 4) addr = u_boot_utils.find_ram_base(u_boot_console)
fn = f['fn'] fn = f['fn']
output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))

4
test/py/tests/test_net.py
View File

@ -146,7 +146,7 @@ def test_net_tftpboot(u_boot_console):
addr = f.get('addr', None) addr = f.get('addr', None)
if not addr: if not addr:
addr = u_boot_utils.find_ram_base(u_boot_console) + (1024 * 1024 * 4) addr = u_boot_utils.find_ram_base(u_boot_console)
fn = f['fn'] fn = f['fn']
output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn)) output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
@ -186,7 +186,7 @@ def test_net_nfs(u_boot_console):
addr = f.get('addr', None) addr = f.get('addr', None)
if not addr: if not addr:
addr = u_boot_utils.find_ram_base(u_boot_console) + (1024 * 1024 * 4) addr = u_boot_utils.find_ram_base(u_boot_console)
fn = f['fn'] fn = f['fn']
output = u_boot_console.run_command('nfs %x %s' % (addr, fn)) output = u_boot_console.run_command('nfs %x %s' % (addr, fn))

4
test/py/tests/test_tpm2.py
View File

@ -183,7 +183,7 @@ def test_tpm2_pcr_read(u_boot_console):
""" """
force_init(u_boot_console) force_init(u_boot_console)
ram = u_boot_utils.find_ram_base(u_boot_console) + 1024 ram = u_boot_utils.find_ram_base(u_boot_console)
read_pcr = u_boot_console.run_command('tpm pcr_read 0 0x%x' % ram) read_pcr = u_boot_console.run_command('tpm pcr_read 0 0x%x' % ram)
output = u_boot_console.run_command('echo $?') output = u_boot_console.run_command('echo $?')
@ -210,7 +210,7 @@ def test_tpm2_pcr_extend(u_boot_console):
""" """
force_init(u_boot_console) force_init(u_boot_console)
ram = u_boot_utils.find_ram_base(u_boot_console) + 1024 ram = u_boot_utils.find_ram_base(u_boot_console)
u_boot_console.run_command('tpm pcr_extend 0 0x%x' % ram) u_boot_console.run_command('tpm pcr_extend 0 0x%x' % ram)
output = u_boot_console.run_command('echo $?') output = u_boot_console.run_command('echo $?')