summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@bootlin.com>2018-07-09 19:16:27 +0200
committerTom Rini <trini@konsulko.com>2018-07-20 15:55:08 -0400
commitf4eef40b01331696d780e9e782106e369c55df10 (patch)
tree73e4baa0390caa1ac0339c8b138d9d15d3a00325 /test
parentabba76354a049c48fcdf4a252383ccd5c119b8ae (diff)
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>
Diffstat (limited to 'test')
-rw-r--r--test/py/tests/test_efi_loader.py2
-rw-r--r--test/py/tests/test_net.py4
-rw-r--r--test/py/tests/test_tpm2.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py
index 35bd4194ae..a66c6e6f94 100644
--- a/test/py/tests/test_efi_loader.py
+++ b/test/py/tests/test_efi_loader.py
@@ -118,7 +118,7 @@ def fetch_tftp_file(u_boot_console, env_conf):
addr = f.get('addr', None)
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']
output = u_boot_console.run_command('tftpboot %x %s' % (addr, fn))
diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
index f2e432b6af..2821ce65da 100644
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -146,7 +146,7 @@ def test_net_tftpboot(u_boot_console):
addr = f.get('addr', None)
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']
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)
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']
output = u_boot_console.run_command('nfs %x %s' % (addr, fn))
diff --git a/test/py/tests/test_tpm2.py b/test/py/tests/test_tpm2.py
index 01ffb3178d..ef7b86a923 100644
--- a/test/py/tests/test_tpm2.py
+++ b/test/py/tests/test_tpm2.py
@@ -183,7 +183,7 @@ def test_tpm2_pcr_read(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)
output = u_boot_console.run_command('echo $?')
@@ -210,7 +210,7 @@ def test_tpm2_pcr_extend(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)
output = u_boot_console.run_command('echo $?')